Skip to content
This repository
Browse code

Merge pull request #2951 from jmbreuer/upstream-diskuniqueid

Generate stable DVD disk IDs by performing CSS first
  • Loading branch information...
commit 52e2c692d2e6d37d811e944519db3607bb1092ca 2 parents c218d5c + 6c3aa00
Voyager1 authored July 15, 2013

Showing 1 changed file with 2 additions and 4 deletions. Show diff stats Hide diff stats

  1. 6  xbmc/filesystem/iso9660.cpp
6  xbmc/filesystem/iso9660.cpp
@@ -902,15 +902,13 @@ long iso9660::ReadFile(HANDLE hFile, uint8_t *pBuffer, long lSize)
902 902
   if ( pContext->m_bUseMode2 )
903 903
     sectorSize = MODE2_DATA_SIZE;
904 904
 
905  
-  while (lSize > 0 && pContext->m_dwFilePos <= pContext->m_dwFileSize)
  905
+  while (lSize > 0 && pContext->m_dwFilePos < pContext->m_dwFileSize)
906 906
   {
907 907
     pContext->m_dwCurrentBlock = (DWORD) (pContext->m_dwFilePos / sectorSize);
908 908
     int64_t iOffsetInBuffer = pContext->m_dwFilePos - (sectorSize * pContext->m_dwCurrentBlock);
909 909
     pContext->m_dwCurrentBlock += pContext->m_dwStartBlock;
910 910
 
911  
-    //char szBuf[256];
912  
-    //sprintf(szBuf,"pos:%i cblk:%i sblk:%i off:%i",(long)m_dwFilePos, (long)m_dwCurrentBlock,(long)m_dwStartBlock,(long)iOffsetInBuffer);
913  
-    //DBG(szBuf);
  911
+    // CLog::Log(LOGDEBUG, "pos:%li cblk:%li sblk:%li off:%li",(long)pContext->m_dwFilePos, (long)pContext->m_dwCurrentBlock,(long)pContext->m_dwStartBlock,(long)iOffsetInBuffer);
914 912
 
915 913
     uint8_t* pSector;
916 914
     bError = !ReadSectorFromCache(pContext, pContext->m_dwCurrentBlock, &pSector);

0 notes on commit 52e2c69

Please sign in to comment.
Something went wrong with that request. Please try again.