Skip to content

Commit 8c223cb

Browse files
livecodeianlivecodeian
committed
[[ Bug 17615 ]] Keep Peter happy
1 parent 3dfe253 commit 8c223cb

1 file changed

Lines changed: 16 additions & 5 deletions

File tree

‎engine/src/cgimageutil.cpp‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ bool MCGRasterCreateCGDataProvider(const MCGRaster &p_raster, const MCGIntegerRe
125125
if (!p_copy)
126126
{
127127
t_dst_stride = p_raster.stride;
128-
t_success = nil != (t_data_provider = CGDataProviderCreateWithData(nil, t_src_ptr, t_height * p_raster.stride, nil));
128+
t_data_provider = CGDataProviderCreateWithData(nil, t_src_ptr, t_height * p_raster.stride, nil);
129+
t_success = t_data_provider != nil;
129130
}
130131
else
131132
{
@@ -158,7 +159,10 @@ bool MCGRasterCreateCGDataProvider(const MCGRaster &p_raster, const MCGIntegerRe
158159
}
159160
}
160161
if (t_success)
161-
t_success = nil != (t_data_provider = CGDataProviderCreateWithData(nil, t_buffer, t_buffer_size, __CGDataProviderDeallocate));
162+
{
163+
t_data_provider = CGDataProviderCreateWithData(nil, t_buffer, t_buffer_size, __CGDataProviderDeallocate);
164+
t_success = t_data_provider != nil;
165+
}
162166

163167
if (!t_success)
164168
MCMemoryDeallocate(t_buffer);
@@ -193,7 +197,10 @@ bool MCGRasterToCGImage(const MCGRaster &p_raster, const MCGIntegerRectangle &p_
193197
t_bm_info = MCGPixelFormatToCGBitmapInfo(kMCGPixelFormatNative, t_alpha);
194198

195199
if (t_success)
196-
t_success = nil != (t_image = CGImageCreate(p_src_rect.size.width, p_src_rect.size.height, 8, 32, t_dst_stride, p_colorspace, t_bm_info, t_data_provider, nil, true, kCGRenderingIntentDefault));
200+
{
201+
t_image = CGImageCreate(p_src_rect.size.width, p_src_rect.size.height, 8, 32, t_dst_stride, p_colorspace, t_bm_info, t_data_provider, nil, true, kCGRenderingIntentDefault);
202+
t_success = t_image != nil;
203+
}
197204

198205
CGDataProviderRelease(t_data_provider);
199206

@@ -233,7 +240,8 @@ bool MCGImageCreateCGDataProvider(MCGImageRef p_src, const MCGIntegerRectangle &
233240
const void *t_src_ptr;
234241
t_src_ptr = MCGRasterGetPixelPtr(t_raster, p_src_rect.origin.x, p_src_rect.origin.y);
235242

236-
t_success = nil != (t_data_provider = CGDataProviderCreateWithData(p_src, t_src_ptr, p_src_rect.size.height * t_raster.stride, MCGImageDataProviderReleaseDataCallback));
243+
t_data_provider = CGDataProviderCreateWithData(p_src, t_src_ptr, p_src_rect.size.height * t_raster.stride, MCGImageDataProviderReleaseDataCallback);
244+
t_success = t_data_provider != nil;
237245
}
238246

239247
if (t_success)
@@ -272,7 +280,10 @@ bool MCGImageToCGImage(MCGImageRef p_src, const MCGIntegerRectangle &p_src_rect,
272280
t_bm_info = MCGPixelFormatToCGBitmapInfo(kMCGPixelFormatNative, t_alpha);
273281

274282
if (t_success)
275-
t_success = nil != (t_image = CGImageCreate(p_src_rect.size.width, p_src_rect.size.height, 8, 32, t_raster.stride, p_colorspace, t_bm_info, t_data_provider, nil, true, kCGRenderingIntentDefault));
283+
{
284+
t_image = CGImageCreate(p_src_rect.size.width, p_src_rect.size.height, 8, 32, t_raster.stride, p_colorspace, t_bm_info, t_data_provider, nil, true, kCGRenderingIntentDefault);
285+
t_success = t_image != nil;
286+
}
276287

277288
CGDataProviderRelease(t_data_provider);
278289

0 commit comments

Comments
 (0)