Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorbjörn Svensson2018-03-16 18:25:25 +0000
committerLeo Ufimtsev2018-03-27 13:53:48 +0000
commita95e8a2b264972bbb609d56159553818ea82399f (patch)
treea76385fd4f8b6ce2df4452fabaa42f0fbff3413c /bundles/org.eclipse.swt.tools
parent8005d6cfb67621d552f928b7b14f0c2130897fea (diff)
downloadeclipse.platform.swt-a95e8a2b264972bbb609d56159553818ea82399f.tar.gz
eclipse.platform.swt-a95e8a2b264972bbb609d56159553818ea82399f.tar.xz
eclipse.platform.swt-a95e8a2b264972bbb609d56159553818ea82399f.zip
Bug 461646 - Allow EOL+EOF in 8bit RE-encoded BMP
Images converted to 8bit run-length encoded BMP using imagemagick contains EOL + EOF as the last bytes rather than a single EOF. Change-Id: I8e6790ca7e5217beb6e183a4cf13811a303d5a5a Signed-off-by: Torbjörn Svensson <torbjorn.svensson@st.com>
Diffstat (limited to 'bundles/org.eclipse.swt.tools')
-rw-r--r--bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java b/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java
index 6ca0f18ca6..9f47a6aa91 100644
--- a/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java
+++ b/bundles/org.eclipse.swt.tools/Icon Exe/org/eclipse/swt/tools/internal/IconExe.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Torbjörn Svensson (STMicroelectronics) - bug #461646
*******************************************************************************/
package org.eclipse.swt.tools.internal;
@@ -2780,8 +2781,6 @@ int decompressRLE4Data(byte[] src, int numBytes, int stride, byte[] dest, int de
y++;
x = 0;
dp = y * stride;
- if (dp >= de)
- return -1;
break;
case 1: /* end of bitmap */
return 1;
@@ -2846,8 +2845,6 @@ int decompressRLE8Data(byte[] src, int numBytes, int stride, byte[] dest, int de
y++;
x = 0;
dp = y * stride;
- if (dp >= de)
- return -1;
break;
case 1: /* end of bitmap */
return 1;

Back to the top