You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2008/09/10 13:18:13 UTC
svn commit: r693790 -
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/Environment.cpp
Author: odeakin
Date: Wed Sep 10 04:18:12 2008
New Revision: 693790
URL: http://svn.apache.org/viewvc?rev=693790&view=rev
Log:
Fixing 2 minor errors from HARMONY-5976:
- Only close font if we successfully opened it.
- Use the correct deallocator for the font style.
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/Environment.cpp
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/Environment.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/Environment.cpp?rev=693790&r1=693789&r2=693790&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/Environment.cpp (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/shared/Environment.cpp Wed Sep 10 04:18:12 2008
@@ -202,9 +202,9 @@
return 0;
}
}
- }
- fclose(font);
+ fclose(font);
+ }
return -1;
}
@@ -232,7 +232,7 @@
if (fStyle == NULL || result == -1)
{
- delete[] fStyle;
+ delete fStyle;
delete fh;
return NULL;
}else {