imagehandlingutilities/thumbnailmanager/plugins/audio/src/thumbnailimagedecoderv3.cpp
equal
deleted
inserted
replaced
135 } |
135 } |
136 |
136 |
137 TInt err = iBitmap->Create( loadSize, aDisplayMode ); |
137 TInt err = iBitmap->Create( loadSize, aDisplayMode ); |
138 if (err != KErrNone) |
138 if (err != KErrNone) |
139 { |
139 { |
140 delete iBitmap; |
140 Release(); |
141 iBitmap = NULL; |
|
142 User::Leave(err); |
141 User::Leave(err); |
143 } |
142 } |
144 |
143 |
145 iDecoder->Convert( &iStatus, * iBitmap ); |
144 iDecoder->Convert( &iStatus, * iBitmap ); |
146 |
145 |
238 LeaveIfCorruptL( decErr ); |
237 LeaveIfCorruptL( decErr ); |
239 // don't force any mime type |
238 // don't force any mime type |
240 TRAPD( decErr, iDecoder = CImageDecoder::DataNewL( iFs, *iBuffer, options ) ); |
239 TRAPD( decErr, iDecoder = CImageDecoder::DataNewL( iFs, *iBuffer, options ) ); |
241 if ( decErr != KErrNone ) |
240 if ( decErr != KErrNone ) |
242 { |
241 { |
243 delete iBuffer; |
242 Release(); |
244 iBuffer = NULL; |
|
245 |
|
246 TN_DEBUG2( "CThumbnailImageDecoderv3::CreateDecoderL() - CImageDecoder error %d", decErr ); |
243 TN_DEBUG2( "CThumbnailImageDecoderv3::CreateDecoderL() - CImageDecoder error %d", decErr ); |
247 |
244 |
248 User::Leave( decErr ); |
245 User::Leave( decErr ); |
249 } |
246 } |
250 |
247 |
280 void CThumbnailImageDecoderv3::LeaveIfCorruptL(const TInt aError ) |
277 void CThumbnailImageDecoderv3::LeaveIfCorruptL(const TInt aError ) |
281 { |
278 { |
282 //no sense to try other codecs if image is corrupted |
279 //no sense to try other codecs if image is corrupted |
283 if( aError == KErrCorrupt || aError == KErrUnderflow) |
280 if( aError == KErrCorrupt || aError == KErrUnderflow) |
284 { |
281 { |
|
282 Release(); |
285 User::Leave( aError ); |
283 User::Leave( aError ); |
286 } |
284 } |
287 } |
285 } |
288 |
286 |
289 //End of file |
287 //End of file |