gridarta-commit

[Gridarta-commit] SF.net SVN: gridarta:[9713] streams/tilestretching/src/model/src/main/java/ net/sf/gridarta/model/face/StretchedImageFilter.java

[<aki...@us...>]

Revision: 9713
          http://sourceforge.net/p/gridarta/code/9713
Author:   akirschbaum
Date:     2014-11-28 19:28:22 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
Simplify code.

Modified Paths:
--------------
    streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java

Modified: streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java
===================================================================
--- streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java	2014-11-28 14:31:46 UTC (rev 9712)
+++ streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java	2014-11-28 19:28:22 UTC (rev 9713)
@@ -140,14 +140,10 @@
     }
 
     private void copyPixelToPixel(final int x, final int y, final int x2, final int y2, final double brightness, final int wd, final int ht, final int wd2, final int ht2, @NotNull final ColorModel model) {
-        if (x < 0 || y < 0 || x2 < 0 || y2 < 0) {
+        if (x < 0 || y < 0 || x2 < 0 || y2 < 0 || x >= wd || x2 >= wd2 || y >= ht || y2 >= ht2) {
             return;
         }
 
-        if (x >= wd || x2 >= wd2 || y >= ht || y2 >= ht2) {
-            return;
-        }
-
         final int color = model.getRGB(pixels[y * wd + x]);
 
         final int a = (color >> 24) & 0xff;
@@ -173,13 +169,8 @@
         final int destH = maxDestY - minDestY;
 
         if (destH == 0) {
-            if (srcH == 0) {
-                copyPixelToPixel(srcX, minSrcY, destX, minDestY, brightness, wd, ht, wd2, ht2, model);
-                return;
-            } else {
-                copyPixelToPixel(srcX, (maxSrcY - minSrcY) / 2, destX, minDestY, brightness, wd, ht, wd2, ht2, model);
-                return;
-            }
+            copyPixelToPixel(srcX, srcH == 0 ? minSrcY : (maxSrcY - minSrcY) / 2, destX, minDestY, brightness, wd, ht, wd2, ht2, model);
+            return;
         }
 
         if (srcH == 0) {
@@ -199,10 +190,8 @@
             copyPixelToPixel(srcX, getY, destX, goY, brightness, wd, ht, wd2, ht2, model);
         }
 
-        if (extra) {
-            if (maxDestY + 1 < ht2) {
-                copyPixelToPixel(srcX, maxSrcY, destX, maxDestY + 1, brightness, wd, ht, wd2, ht2, model);
-            }
+        if (extra && maxDestY + 1 < ht2) {
+            copyPixelToPixel(srcX, maxSrcY, destX, maxDestY + 1, brightness, wd, ht, wd2, ht2, model);
         }
     }
 
@@ -277,11 +266,7 @@
 
                 final int srcLen = stdTileHalfLen[dx];
 
-                if (lnNum < 2) {
-                    copyVerticalLine(dx, 11 + srcLen, 11 - srcLen, dx, dy, y2, wDark, flat, wd, ht, wd2, ht2, model);
-                } else {
-                    copyVerticalLine(dx, 11 + srcLen, 11 - srcLen, dx, dy, y2, eDark, flat, wd, ht, wd2, ht2, model);
-                }
+                copyVerticalLine(dx, 11 + srcLen, 11 - srcLen, dx, dy, y2, lnNum < 2 ? wDark : eDark, flat, wd, ht, wd2, ht2, model);
 
                 dx += destXInc;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[9714] streams/tilestretching/src/model/src/main/java/ net/sf/gridarta/model/face/StretchedImageFilter.java

[<aki...@us...>]

Revision: 9714
          http://sourceforge.net/p/gridarta/code/9714
Author:   akirschbaum
Date:     2014-11-28 19:30:33 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
Use proper type for variable.

Modified Paths:
--------------
    streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java

Modified: streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java
===================================================================
--- streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java	2014-11-28 19:28:22 UTC (rev 9713)
+++ streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java	2014-11-28 19:30:33 UTC (rev 9714)
@@ -249,10 +249,10 @@
             double kicker = 0.0;
             int y2 = destSy2;
             double kicker2 = 0.0;
-            int atLeastOne = 0;
+            boolean atLeastOne = false;
 
-            while ((destSlope != 0.0 && dx != destEx && dy != destEy) || (atLeastOne == 0 && destSlope == 0.0)) {
-                atLeastOne = 1;
+            while ((destSlope != 0.0 && dx != destEx && dy != destEy) || (!atLeastOne && destSlope == 0.0)) {
+                atLeastOne = true;
 
                 if (kicker >= 1.0) {
                     kicker -= 1.0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gridarta-commit] SF.net SVN: gridarta:[9715] streams/tilestretching/src/model/src/main/java/ net/sf/gridarta/model/face/StretchedImageFilter.java

[<aki...@us...>]

Revision: 9715
          http://sourceforge.net/p/gridarta/code/9715
Author:   akirschbaum
Date:     2014-11-28 19:32:57 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
Make variables final.

Modified Paths:
--------------
    streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java

Modified: streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java
===================================================================
--- streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java	2014-11-28 19:30:33 UTC (rev 9714)
+++ streams/tilestretching/src/model/src/main/java/net/sf/gridarta/model/face/StretchedImageFilter.java	2014-11-28 19:32:57 UTC (rev 9715)
@@ -206,22 +206,27 @@
 
         final boolean flat = n != 0 || e != 0 || w != 0 || s != 0;
 
-        double eDark = 1.0;
-        double wDark = 1.0;
+        final double eDark;
+        final double wDark;
         if (w > e) {
             wDark = 1.0 - ((w - e) / 25.0);
 
             if (n > 0 || s > 0) {
                 eDark = wDark;
+            } else {
+                eDark = 1.0;
             }
-        }
-
-        if (e > w) {
+        } else if (e > w) {
             eDark = 1.0 + ((e - w) / 25.0);
 
             if (s > 0 || n > 0) {
                 wDark = eDark;
+            } else {
+                wDark = 1.0;
             }
+        } else {
+            eDark = 1.0;
+            wDark = 1.0;
         }
 
         determineLine(0, 2, 10 - w + n, 22, 0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.