Merge pull request #5 from aczid/png

Cleaned up use of pointers in PNG library
SHA2017-badge · Jun 21, 2017 · ca3088f · ca3088f
2 parents 1a6ef71 + fbb3231
commit ca3088f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c
@@ -467,7 +467,7 @@ static bool_t PNG_zCopyInput(PNG_decode *d, unsigned length) {
 		WRAP_ZBUF(d->z.bufend);
 		if (d->z.bufend == d->z.bufpos) {		// Buffer full?
 			d->z.flags = (d->z.flags & ~PNG_ZFLG_RESUME_MASK) | PNG_ZFLG_RESUME_COPY;
-			((unsigned *)d->z.tmp)[0] = length;
+			(d->z.tmp)[0] = length;
 			return TRUE;
 		}
 	}
@@ -570,8 +570,8 @@ static bool_t PNG_zInflateBlock(PNG_decode *d) {
 			WRAP_ZBUF(offset);
 			if (d->z.bufend == d->z.bufpos) {								// Buffer full?
 				d->z.flags = (d->z.flags & ~PNG_ZFLG_RESUME_MASK) | PNG_ZFLG_RESUME_OFFSET;
-				((unsigned *)d->z.tmp)[0] = length;
-				((unsigned *)d->z.tmp)[1] = offset;
+				(d->z.tmp)[0] = length;
+				(d->z.tmp)[1] = offset;
 				return TRUE;
 			}
 		}
@@ -630,8 +630,8 @@ static bool_t PNG_zResumeOffset(PNG_decode *d, unsigned length, unsigned offset)
 		WRAP_ZBUF(offset);
 		if (d->z.bufend == d->z.bufpos) {						// Buffer full?
 			d->z.flags = (d->z.flags & ~PNG_ZFLG_RESUME_MASK) | PNG_ZFLG_RESUME_OFFSET;
-			((unsigned *)d->z.tmp)[0] = length;
-			((unsigned *)d->z.tmp)[1] = offset;
+			(d->z.tmp)[0] = length;
+			(d->z.tmp)[1] = offset;
 			return TRUE;
 		}
 	}
@@ -653,15 +653,15 @@ static uint8_t PNG_zGetByte(PNG_decode *d) {
 				return 0xFF;
 			break;
 		case PNG_ZFLG_RESUME_COPY:			// Resume uncompressed block copy for length bytes
-			if (!PNG_zCopyInput(d, ((unsigned *)d->z.tmp)[0]))
+			if (!PNG_zCopyInput(d, (d->z.tmp)[0]))
 				return 0xFF;
 			break;
 		case PNG_ZFLG_RESUME_INFLATE:		// Resume compressed block
 			if (!PNG_zInflateBlock(d))
 				return 0xFF;
 			break;
 		case PNG_ZFLG_RESUME_OFFSET:		// Resume compressed block using offset copy for length bytes
-			if (!PNG_zResumeOffset(d, ((unsigned *)d->z.tmp)[0], ((unsigned *)d->z.tmp)[1]))
+			if (!PNG_zResumeOffset(d, (d->z.tmp)[0], (d->z.tmp)[1]))
 				return 0xFF;
 			break;
 		}

diff --git a/src/gdisp/gdisp_image_support.h b/src/gdisp/gdisp_image_support.h
@@ -18,7 +18,7 @@
 #define _GDISP_IMAGE_SUPPORT_H
 
 /* Base endian handling routines */
-#define gdispImageGetVar(type, p, idx)				(*(type *)(((uint8_t *)(p))+(idx)))
+#define gdispImageGetVar(type, p, idx)              (*(type*) ((intptr_t) p + idx))
 #define gdispImageGetByte(type, p, idx, shift)		(((type)gdispImageGetVar(uint8_t, p, idx))<<(shift))
 #define gdispImageSwap16(w)							((((uint16_t)(w))>>8)|(((uint16_t)(w))<<8))
 #define gdispImageSwap32(dw)						((((uint32_t)(w))>>24)|((((uint32_t)(w))&0x00FF0000)>>8)\