Index: jdmrgext.c |
=================================================================== |
--- jdmrgext.c (revision 134206) |
+++ jdmrgext.c (working copy) |
@@ -2,6 +2,7 @@ |
* jdmrgext.c |
* |
* Copyright (C) 1994-1996, Thomas G. Lane. |
+ * Copyright (C) 2011, D. R. Commander. |
* This file is part of the Independent JPEG Group's software. |
* For conditions of distribution and use, see the accompanying README file. |
* |
@@ -54,11 +55,17 @@ |
outptr[RGB_RED] = range_limit[y + cred]; |
outptr[RGB_GREEN] = range_limit[y + cgreen]; |
outptr[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr[RGB_ALPHA] = 0xFF; |
+#endif |
outptr += RGB_PIXELSIZE; |
y = GETJSAMPLE(*inptr0++); |
outptr[RGB_RED] = range_limit[y + cred]; |
outptr[RGB_GREEN] = range_limit[y + cgreen]; |
outptr[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr[RGB_ALPHA] = 0xFF; |
+#endif |
outptr += RGB_PIXELSIZE; |
} |
/* If image width is odd, do the last output column separately */ |
@@ -72,6 +79,9 @@ |
outptr[RGB_RED] = range_limit[y + cred]; |
outptr[RGB_GREEN] = range_limit[y + cgreen]; |
outptr[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr[RGB_ALPHA] = 0xFF; |
+#endif |
} |
} |
@@ -120,21 +130,33 @@ |
outptr0[RGB_RED] = range_limit[y + cred]; |
outptr0[RGB_GREEN] = range_limit[y + cgreen]; |
outptr0[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr0[RGB_ALPHA] = 0xFF; |
+#endif |
outptr0 += RGB_PIXELSIZE; |
y = GETJSAMPLE(*inptr00++); |
outptr0[RGB_RED] = range_limit[y + cred]; |
outptr0[RGB_GREEN] = range_limit[y + cgreen]; |
outptr0[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr0[RGB_ALPHA] = 0xFF; |
+#endif |
outptr0 += RGB_PIXELSIZE; |
y = GETJSAMPLE(*inptr01++); |
outptr1[RGB_RED] = range_limit[y + cred]; |
outptr1[RGB_GREEN] = range_limit[y + cgreen]; |
outptr1[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr1[RGB_ALPHA] = 0xFF; |
+#endif |
outptr1 += RGB_PIXELSIZE; |
y = GETJSAMPLE(*inptr01++); |
outptr1[RGB_RED] = range_limit[y + cred]; |
outptr1[RGB_GREEN] = range_limit[y + cgreen]; |
outptr1[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr1[RGB_ALPHA] = 0xFF; |
+#endif |
outptr1 += RGB_PIXELSIZE; |
} |
/* If image width is odd, do the last output column separately */ |
@@ -148,9 +170,15 @@ |
outptr0[RGB_RED] = range_limit[y + cred]; |
outptr0[RGB_GREEN] = range_limit[y + cgreen]; |
outptr0[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr0[RGB_ALPHA] = 0xFF; |
+#endif |
y = GETJSAMPLE(*inptr01); |
outptr1[RGB_RED] = range_limit[y + cred]; |
outptr1[RGB_GREEN] = range_limit[y + cgreen]; |
outptr1[RGB_BLUE] = range_limit[y + cblue]; |
+#ifdef RGB_ALPHA |
+ outptr1[RGB_ALPHA] = 0xFF; |
+#endif |
} |
} |