r3397 - packages/trunk/cultivation/debian/patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-15 16:22:28 +0000 (Sun, 15 Jul 2007)
New Revision: 3397

Modified:
   packages/trunk/cultivation/debian/patches/abs_paths.patch
Log:
Corrected patch to avoid double free()



Modified: packages/trunk/cultivation/debian/patches/abs_paths.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/abs_paths.patch	2007-07-13 23:46:46 UTC (rev 3396)
+++ packages/trunk/cultivation/debian/patches/abs_paths.patch	2007-07-15 16:22:28 UTC (rev 3397)
@@ -9,23 +9,21 @@
  #include "minorGems/graphics/openGL/ScreenGL.h"
  #include "minorGems/graphics/openGL/SceneHandlerGL.h"
  #include "minorGems/graphics/Color.h"
-@@ -897,7 +899,8 @@
+@@ -897,7 +899,7 @@
      // load font image
      TGAImageConverter tga;
  
 -    File fontFile( NULL, "font.tga" );
-+    Path fontPath( DATADIR );
-+    File fontFile( &fontPath, "font.tga" );
++    File fontFile( new Path(DATADIR), "font.tga" );
      FileInputStream fontInput( &fontFile );
  
      Image *fontImage = tga.deformatImage( &fontInput );
-@@ -980,7 +983,8 @@
+@@ -980,7 +983,7 @@
      mCurrentTipStoredItem = -1;
      
      // translation language for tool tips
 -    File languageNameFile( NULL, "language.txt" );
-+    Path languagePath( DATADIR );
-+    File languageNameFile( &languagePath, "language.txt" );
++    File languageNameFile( new Path(DATADIR), "language.txt" );
  
      if( languageNameFile.exists() ) {
          char *languageNameText = languageNameFile.readFileContents();