--- a/imagingmodules/jp2kcodec/Src/JP2KPacket.cpp	Thu Dec 17 09:22:31 2009 +0200
+++ b/imagingmodules/jp2kcodec/Src/JP2KPacket.cpp	Sat Feb 20 00:07:53 2010 +0200
@@ -97,17 +97,17 @@
     }
 
 // -----------------------------------------------------------------------------
-// CJ2kPacket::SetNumOfBlocks
+// CJ2kPacket::SetNumOfBlocksL
 // Set the number of blocks
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-void CJ2kPacket::SetNumOfBlocks( TSize& aCodeBlock )
+void CJ2kPacket::SetNumOfBlocksL( TSize& aCodeBlock )
     {
-    TInt32 x0 = TJ2kUtils::Floor( iPacketCanvas.iTl.iX, aCodeBlock.iWidth ) * aCodeBlock.iWidth;
-    TInt32 y0 = TJ2kUtils::Floor( iPacketCanvas.iTl.iY, aCodeBlock.iHeight ) * aCodeBlock.iHeight;
-    TInt32 x1 = TJ2kUtils::Ceil( iPacketCanvas.iTl.iX + iPacketCanvas.Width(), aCodeBlock.iWidth ) * aCodeBlock.iWidth;
-    TInt32 y1 = TJ2kUtils::Ceil( iPacketCanvas.iTl.iY + iPacketCanvas.Height(), aCodeBlock.iHeight ) * aCodeBlock.iHeight;
+    TInt32 x0 = TJ2kUtils::FloorL( iPacketCanvas.iTl.iX, aCodeBlock.iWidth ) * aCodeBlock.iWidth;
+    TInt32 y0 = TJ2kUtils::FloorL( iPacketCanvas.iTl.iY, aCodeBlock.iHeight ) * aCodeBlock.iHeight;
+    TInt32 x1 = TJ2kUtils::CeilL( iPacketCanvas.iTl.iX + iPacketCanvas.Width(), aCodeBlock.iWidth ) * aCodeBlock.iWidth;
+    TInt32 y1 = TJ2kUtils::CeilL( iPacketCanvas.iTl.iY + iPacketCanvas.Height(), aCodeBlock.iHeight ) * aCodeBlock.iHeight;
     iCodeBlockSize.iWidth  = ( x1 - x0 ) / aCodeBlock.iWidth;
     iCodeBlockSize.iHeight = ( y1 - y0 ) / aCodeBlock.iHeight;
     }
@@ -237,6 +237,7 @@
                         while ( subband->SubbandType() != aSubband.LastSubbandProcessed() )
                             {
                             subband = subband->NextSubbandRaster();
+                            User::LeaveIfNull(subband);
                             }
                         }
                     }
@@ -865,6 +866,7 @@
                 while ( subband->SubbandType() != aSubband.LastSubbandProcessed() )
                     {
                     subband = subband->NextSubbandRaster();
+                    User::LeaveIfNull(subband); 
                     }
                 }
             }
@@ -877,9 +879,10 @@
         TUint16 layer = aTile.LastLayerProcessed();
         TInt32  totalLength = 0;
         TUint8 *rollbackPtr = CONST_CAST( TUint8*, reader.iPtr );
+        CJ2kCodeBlock *codeBlock = 0;
         
-        CJ2kPacket *packet = CONST_CAST( CJ2kPacket*, &subband->PacketAt( aSubband.LastPacketProcessed() ) );
-        CJ2kCodeBlock *codeBlock = 0;
+        CJ2kPacket * packet = CONST_CAST( CJ2kPacket*, &subband->PacketAt( aSubband.LastPacketProcessed() ) );
+        
         do
             {