Changeset 19948 in osm

Timestamp:

2010-02-09T19:27:41+01:00 (14 years ago)

Author:

clementm

Message:

VectorImageModifier modifications:

• Remove apparently useless code as makeTransparent and replaceColors are exclusive.
• Corrected invertGrey + makeTransparent issues (grey colors could become transparent).

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/VectorImageModifier.java (modified) (5 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/VectorImageModifier.java

@@ -16 +16 @@
     public static int cadastreBackgroundTransp = 1; // original white but transparent
 
-    private boolean withBackground = false;
-
     private int backgroundPixel = 0;
-
-    private int backgroundSampleX, backgroundSampleY;
 
     public VectorImageModifier(BufferedImage bi) {
@@ -44 +40 @@
                 if (pixel == cadastreBackground) {
                     bufferedImage.setRGB(x, y, josmBackgroundColor);
-                    if (!withBackground)
-                        withBackground = true;
-                    backgroundSampleX = x;
-                    backgroundSampleY = y;
                 }
             }
         }
+        // The cadastre has now a new background (for invertGrey())
+        cadastreBackground = josmBackgroundColor;
     }
 
@@ -81 +75 @@
         int b = col.getBlue();
         if ((b == r) && (b == g)) {
-            pixel = (0x00 << 32) + ((byte) (255 - r) << 16) + ((byte) (255 - r) << 8) + ((byte) (255 - r));
+            pixel = ((byte) col.getAlpha() << 24) + ((byte) (255 - r) << 16) + ((byte) (255 - r) << 8) + ((byte) (255 - r));
         }
+        // Maybe we should try to find a better formula to avoid discontinuity when text is drawn on a colored item
+        // (building, ...). One could use the conversion to and from HSB to only change the brightness not the color.
+        // Note: the color palette does not have the inverse colors so it may be very weird!
         return pixel;
     }
@@ -93 +90 @@
             WritableRaster raster = bufferedImage.getRaster();
             // pixel is offset in ICM's palette
-            if (withBackground)
-                backgroundPixel = raster.getSample(backgroundSampleX, backgroundSampleY, 0);
-            else
-                backgroundPixel = 1; // default Cadastre background sample
+            backgroundPixel = 1; // default Cadastre background sample
             int size = icm.getMapSize();
             byte[] reds = new byte[size];
@@ -104 +98 @@
             icm.getGreens(greens);
             icm.getBlues(blues);
+            // The cadastre background has now an alpha to 0 (for invertGrey())
+            cadastreBackground = 0x00ffffff;
             IndexColorModel icm2 = new IndexColorModel(colorModel.getPixelSize(), size, reds, greens, blues,
                     backgroundPixel);