CF 1.4

DiegoCatalano · DiegoCatalano · commit e728d6e7f3d6 · 2014-10-30T04:37:54.000-02:00
Color filtering optimized.
diff --git a/Catalano.Image/nbproject/private/private.xml b/Catalano.Image/nbproject/private/private.xml
@@ -2,8 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/Users/Diego/Desktop/Git%20Hub%20Projects/Catalano-Framework/Catalano.Image/src/Catalano/Imaging/Filters/Exp.java</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/Catalano.Image/src/Catalano/Imaging/Filters/ColorFiltering.java b/Catalano.Image/src/Catalano/Imaging/Filters/ColorFiltering.java
@@ -31,18 +31,22 @@
 /**
  * Color filtering.
  * <p> The filter filters pixels inside/outside of specified RGB color range - it keeps pixels with colors inside/outside of specified range and fills the rest with specified color</p>.
+ * 
+ * Supported types: RGB.
+ * Coordinate System: Independent.
+ * 
  * @author Diego Catalano
  */
 public class ColorFiltering implements IBaseInPlace{
     private IntRange red, green, blue;
 
     /**
-     * Initialize a new instance of the BottomHat class.
+     * Initialize a new instance of the ColorFiltering class.
      */
     public ColorFiltering() {}
 
     /**
-     * Initialize a new instance of the BottomHat class.
+     * Initialize a new instance of the ColorFiltering class.
      * @param red Range of red color component.
      * @param green Range of green color component.
      * @param blue Range of blue color component.
@@ -55,30 +59,29 @@ public ColorFiltering(IntRange red, IntRange green, IntRange blue) {
     
     @Override
     public void applyInPlace(FastBitmap fastBitmap){
-        int width = fastBitmap.getWidth();
-        int height = fastBitmap.getHeight();
-        int r,g,b;
         
-        
-        for (int x = 0; x < height; x++) {
-            for (int y = 0; y < width; y++) {
-                r = fastBitmap.getRed(x, y);
-                g = fastBitmap.getGreen(x, y);
-                b = fastBitmap.getBlue(x, y);
-                
+        if(fastBitmap.isRGB()){
+            int r,g,b;
+            int[] pixels = fastBitmap.getRGBData();
+            for (int i = 0; i < pixels.length; i++) {
+                r = pixels[i] >> 16 & 0xFF;
+                g = pixels[i] >> 8 & 0xFF;
+                b = pixels[i] & 0xFF;
+
                 if (
                         (r >= red.getMin()) && (r <= red.getMax()) && 
                         (g >= green.getMin()) && (g <= green.getMax()) && 
                         (b >= blue.getMin()) && (b <= blue.getMax())
                 ){
-                    fastBitmap.setRGB(x, y, r, g, b);
+                    pixels[i] = r << 16 | g << 8 | b;
                 }
                 else{
-                    fastBitmap.setRGB(x, y, 0, 0, 0);
+                    pixels[i] = 0;
                 }
-                
             }
         }
+        else{
+            throw new IllegalArgumentException("Color filtering only works in RGB images.");
+        }
     }
-    
-}
+}
