diff --git a/desmume/src/frontend/cocoa/cocoa_output.mm b/desmume/src/frontend/cocoa/cocoa_output.mm
index 2d0e57c46..ee21b2928 100644
--- a/desmume/src/frontend/cocoa/cocoa_output.mm
+++ b/desmume/src/frontend/cocoa/cocoa_output.mm
@@ -722,10 +722,9 @@
 	pthread_rwlock_unlock(self.rwlockProducer);
 	
 #ifdef MSB_FIRST
-	uint32_t *bitmapDataEnd = bitmapData + (w * h);
-	while (bitmapData < bitmapDataEnd)
+	for (size_t i = 0; i < w * h; i++)
 	{
-		*bitmapData++ = CFSwapInt32LittleToHost(*bitmapData);
+		bitmapData[i] = LE_TO_LOCAL_32(bitmapData[i]);
 	}
 #endif
 	
diff --git a/desmume/src/frontend/cocoa/cocoa_rom.mm b/desmume/src/frontend/cocoa/cocoa_rom.mm
index 5e9b2ae03..fee0e4e2b 100644
--- a/desmume/src/frontend/cocoa/cocoa_rom.mm
+++ b/desmume/src/frontend/cocoa/cocoa_rom.mm
@@ -412,17 +412,15 @@ static NSMutableDictionary *saveTypeValues = nil;
 		return newImage;
 	}
 	
-	NSUInteger w = ROM_ICON_WIDTH;
-	NSUInteger h = ROM_ICON_HEIGHT;
 	NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
-																		 pixelsWide:w
-																		 pixelsHigh:h
+																		 pixelsWide:ROM_ICON_WIDTH
+																		 pixelsHigh:ROM_ICON_HEIGHT
 																	  bitsPerSample:8
 																	samplesPerPixel:4
 																		   hasAlpha:YES
 																		   isPlanar:NO
 																	 colorSpaceName:NSCalibratedRGBColorSpace
-																		bytesPerRow:w * 4
+																		bytesPerRow:ROM_ICON_WIDTH * 4
 																	   bitsPerPixel:32];
 	
 	if(imageRep == nil)
@@ -436,10 +434,9 @@ static NSMutableDictionary *saveTypeValues = nil;
 	RomIconToRGBA8888(bitmapData);
 	
 #ifdef MSB_FIRST
-	uint32_t *bitmapDataEnd = bitmapData + (w * h);
-	while (bitmapData < bitmapDataEnd)
+	for (size_t i = 0; i < ROM_ICON_WIDTH * ROM_ICON_HEIGHT; i++)
 	{
-		*bitmapData++ = CFSwapInt32LittleToHost(*bitmapData);
+		bitmapData[i] = LE_TO_LOCAL_32(bitmapData[i]);
 	}
 #endif
 	
diff --git a/desmume/src/frontend/cocoa/cocoa_videofilter.mm b/desmume/src/frontend/cocoa/cocoa_videofilter.mm
index d8e53efd0..82a16a6f5 100644
--- a/desmume/src/frontend/cocoa/cocoa_videofilter.mm
+++ b/desmume/src/frontend/cocoa/cocoa_videofilter.mm
@@ -142,10 +142,9 @@
 	ColorspaceConvertBuffer888XTo8888Opaque<false, true>((const uint32_t *)[self runFilter], bitmapData, w * h);
 	
 #ifdef MSB_FIRST
-	uint32_t *bitmapDataEnd = bitmapData + (w * h);
-	while (bitmapData < bitmapDataEnd)
+	for (size_t i = 0; i < w * h; i++)
 	{
-		*bitmapData++ = CFSwapInt32LittleToHost(*bitmapData);
+		bitmapData[i] = LE_TO_LOCAL_32(bitmapData[i]);
 	}
 #endif