Opera 12.15 Source Code
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

FixFreeType.patch 1.5KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. diff --git a/modules/libgogi/pi_impl/mde_opfont.cpp b/modules/libgogi/pi_impl/mde_opfont.cpp
  2. index 44efd58..dcb4d40 100644
  3. --- a/modules/libgogi/pi_impl/mde_opfont.cpp
  4. +++ b/modules/libgogi/pi_impl/mde_opfont.cpp
  5. @@ -28,8 +28,8 @@
  6. # include "modules/libfreetype/include/freetype/ftoutln.h"
  7. # else // FT_INTERNAL_FREETYPE
  8. # include <ft2build.h>
  9. -# include <freetype/ftglyph.h>
  10. -# include <freetype/ftoutln.h>
  11. +# include FT_GLYPH_H
  12. +# include FT_OUTLINE_H
  13. # endif // FT_INTERNAL_FREETYPE
  14. # endif // MDF_FREETYPE_SUPPORT && MDEFONT_MODULE
  15. # ifdef MDF_AGFA_SUPPORT
  16. diff --git a/modules/mdefont/mdf_freetype.cpp b/modules/mdefont/mdf_freetype.cpp
  17. index 1708581..6228eca 100644
  18. --- a/modules/mdefont/mdf_freetype.cpp
  19. +++ b/modules/mdefont/mdf_freetype.cpp
  20. @@ -23,10 +23,10 @@
  21. # include "modules/libfreetype/include/freetype/ftsnames.h"
  22. #else // FT_INTERNAL_FREETYPE
  23. # include <ft2build.h>
  24. -# include <freetype/tttables.h>
  25. -# include <freetype/ftoutln.h>
  26. -# include <freetype/ttnameid.h>
  27. -# include <freetype/ftsnames.h>
  28. +# include FT_TRUETYPE_TABLES_H
  29. +# include FT_OUTLINE_H
  30. +# include FT_TRUETYPE_IDS_H
  31. +# include FT_SFNT_NAMES_H
  32. #endif // FT_INTERNAL_FREETYPE
  33. #include FT_FREETYPE_H
  34. @@ -39,7 +39,7 @@
  35. # ifdef FT_INTERNAL_FREETYPE
  36. # include "modules/libfreetype/include/freetype/ftlcdfil.h"
  37. # else // FT_INTERNAL_FREETYPE
  38. -# include <freetype/ftlcdfil.h>
  39. +# include FT_LCD_FILTER_H
  40. # endif // FT_INTERNAL_FREETYPE
  41. #endif // FT_USE_SMOOTH_LCD_RENDERING || FT_USE_SMOOTH_LCDV_RENDERING