i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ICNS translator: use delete [] where new [] was used

Browse Source
This commit is contained in:
Philippe Saint-Pierre
2013-07-17 17:08:28 -04:00
parent a71f2ed86a
commit f74ad62fd4
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/icns/ICNSLoader.cpp
+10 -9
View File
@@ -229,7 +229,7 @@ ICNSSaver::ICNSSaver(BPositionIO *stream, uint32 rowBytes, icns_type_t type)
icns_type_t iconType = icns_get_type_from_image_info(iconInfo); icns_type_t iconType = icns_get_type_from_image_info(iconInfo);
if (iconType == ICNS_NULL_TYPE) { if (iconType == ICNS_NULL_TYPE) {
delete bits; delete[] bits;
free(fIconFamily); free(fIconFamily);
fIconFamily = NULL; fIconFamily = NULL;
return; return;
@@ -249,9 +249,9 @@ ICNSSaver::ICNSSaver(BPositionIO *stream, uint32 rowBytes, icns_type_t type)
if (iconType != ICNS_1024x1024_32BIT_ARGB_DATA if (iconType != ICNS_1024x1024_32BIT_ARGB_DATA
&& iconType != ICNS_512x512_32BIT_ARGB_DATA && iconType != ICNS_512x512_32BIT_ARGB_DATA
&& iconType != ICNS_256x256_32BIT_ARGB_DATA) && iconType != ICNS_256x256_32BIT_ARGB_DATA) {
{ icns_type_t maskType =
icns_type_t maskType = icns_get_mask_type_for_icon_type(iconType); icns_get_mask_type_for_icon_type(iconType);
icns_image_t icnsMask; icns_image_t icnsMask;
icns_init_image_for_type(maskType, &icnsMask); icns_init_image_for_type(maskType, &icnsMask);
@@ -260,7 +260,7 @@ ICNSSaver::ICNSSaver(BPositionIO *stream, uint32 rowBytes, icns_type_t type)
uint32 maskDataOffset = 0; uint32 maskDataOffset = 0;
while (iconDataOffset < icnsImage.imageDataSize while (iconDataOffset < icnsImage.imageDataSize
&& maskDataOffset < icnsMask.imageDataSize) { && maskDataOffset < icnsMask.imageDataSize) {
icnsMask.imageData[maskDataOffset] = icnsMask.imageData[maskDataOffset] =
icnsImage.imageData[iconDataOffset + 3]; icnsImage.imageData[iconDataOffset + 3];
iconDataOffset += 4; iconDataOffset += 4;
@@ -272,9 +272,10 @@ ICNSSaver::ICNSSaver(BPositionIO *stream, uint32 rowBytes, icns_type_t type)
&maskElement); &maskElement);
if (maskElement != NULL) { if (maskElement != NULL) {
if (icnsErr == ICNS_STATUS_OK) if (icnsErr == ICNS_STATUS_OK) {
icns_set_element_in_family(&fIconFamily, maskElement); icns_set_element_in_family(&fIconFamily,
else maskElement);
} else
fCreated = false; fCreated = false;
free(maskElement); free(maskElement);
} }
@@ -286,7 +287,7 @@ ICNSSaver::ICNSSaver(BPositionIO *stream, uint32 rowBytes, icns_type_t type)
fIconFamily = NULL; fIconFamily = NULL;
} }
delete bits; delete[] bits;
} }