summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform/win32/generate.bat238
-rw-r--r--platform/win32/libfonts.vcproj627
-rw-r--r--platform/win32/libmupdf.vcproj4
-rw-r--r--platform/win32/mupdf.sln37
-rw-r--r--source/fitz/load-bmp.c4
5 files changed, 781 insertions, 129 deletions
diff --git a/platform/win32/generate.bat b/platform/win32/generate.bat
index f3c83d49..527799b9 100644
--- a/platform/win32/generate.bat
+++ b/platform/win32/generate.bat
@@ -29,127 +29,127 @@ if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h
if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h resources/certs/AdobeCA.p7c
if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h source/pdf/js/pdf-util.js
-if not exist generated/DroidSansFallback.ttc fontdump.exe generated/DroidSansFallback.ttc resources/fonts/droid/DroidSansFallback.ttc
-if not exist generated/DroidSansFallbackFull.ttc fontdump.exe generated/DroidSansFallbackFull.ttc resources/fonts/droid/DroidSansFallbackFull.ttc
+if not exist generated/DroidSansFallback.c fontdump.exe generated/DroidSansFallback.c resources/fonts/droid/DroidSansFallback.ttc
+if not exist generated/DroidSansFallbackFull.c fontdump.exe generated/DroidSansFallbackFull.c resources/fonts/droid/DroidSansFallbackFull.ttc
-if not exist generated/Dingbats.cff fontdump.exe generated/Dingbats.cff resources/fonts/urw/Dingbats.cff
-if not exist generated/NimbusMono-Bold.cff fontdump.exe generated/NimbusMono-Bold.cff resources/fonts/urw/NimbusMono-Bold.cff
-if not exist generated/NimbusMono-BoldOblique.cff fontdump.exe generated/NimbusMono-BoldOblique.cff resources/fonts/urw/NimbusMono-BoldOblique.cff
-if not exist generated/NimbusMono-Oblique.cff fontdump.exe generated/NimbusMono-Oblique.cff resources/fonts/urw/NimbusMono-Oblique.cff
-if not exist generated/NimbusMono-Regular.cff fontdump.exe generated/NimbusMono-Regular.cff resources/fonts/urw/NimbusMono-Regular.cff
-if not exist generated/NimbusRomNo9L-Med.cff fontdump.exe generated/NimbusRomNo9L-Med.cff resources/fonts/urw/NimbusRomNo9L-Med.cff
-if not exist generated/NimbusRomNo9L-MedIta.cff fontdump.exe generated/NimbusRomNo9L-MedIta.cff resources/fonts/urw/NimbusRomNo9L-MedIta.cff
-if not exist generated/NimbusRomNo9L-Reg.cff fontdump.exe generated/NimbusRomNo9L-Reg.cff resources/fonts/urw/NimbusRomNo9L-Reg.cff
-if not exist generated/NimbusRomNo9L-RegIta.cff fontdump.exe generated/NimbusRomNo9L-RegIta.cff resources/fonts/urw/NimbusRomNo9L-RegIta.cff
-if not exist generated/NimbusSanL-Bol.cff fontdump.exe generated/NimbusSanL-Bol.cff resources/fonts/urw/NimbusSanL-Bol.cff
-if not exist generated/NimbusSanL-BolIta.cff fontdump.exe generated/NimbusSanL-BolIta.cff resources/fonts/urw/NimbusSanL-BolIta.cff
-if not exist generated/NimbusSanL-Reg.cff fontdump.exe generated/NimbusSanL-Reg.cff resources/fonts/urw/NimbusSanL-Reg.cff
-if not exist generated/NimbusSanL-RegIta.cff fontdump.exe generated/NimbusSanL-RegIta.cff resources/fonts/urw/NimbusSanL-RegIta.cff
-if not exist generated/StandardSymL.cff fontdump.exe resources/fonts/urw/StandardSymL.cff resources/fonts/urw/StandardSymL.cff
+if not exist generated/Dingbats.c fontdump.exe generated/Dingbats.c resources/fonts/urw/Dingbats.cff
+if not exist generated/NimbusMono-Bold.c fontdump.exe generated/NimbusMono-Bold.c resources/fonts/urw/NimbusMono-Bold.cff
+if not exist generated/NimbusMono-BoldOblique.c fontdump.exe generated/NimbusMono-BoldOblique.c resources/fonts/urw/NimbusMono-BoldOblique.cff
+if not exist generated/NimbusMono-Oblique.c fontdump.exe generated/NimbusMono-Oblique.c resources/fonts/urw/NimbusMono-Oblique.cff
+if not exist generated/NimbusMono-Regular.c fontdump.exe generated/NimbusMono-Regular.c resources/fonts/urw/NimbusMono-Regular.cff
+if not exist generated/NimbusRomNo9L-Med.c fontdump.exe generated/NimbusRomNo9L-Med.c resources/fonts/urw/NimbusRomNo9L-Med.cff
+if not exist generated/NimbusRomNo9L-MedIta.c fontdump.exe generated/NimbusRomNo9L-MedIta.c resources/fonts/urw/NimbusRomNo9L-MedIta.cff
+if not exist generated/NimbusRomNo9L-Reg.c fontdump.exe generated/NimbusRomNo9L-Reg.c resources/fonts/urw/NimbusRomNo9L-Reg.cff
+if not exist generated/NimbusRomNo9L-RegIta.c fontdump.exe generated/NimbusRomNo9L-RegIta.c resources/fonts/urw/NimbusRomNo9L-RegIta.cff
+if not exist generated/NimbusSanL-Bol.c fontdump.exe generated/NimbusSanL-Bol.c resources/fonts/urw/NimbusSanL-Bol.cff
+if not exist generated/NimbusSanL-BolIta.c fontdump.exe generated/NimbusSanL-BolIta.c resources/fonts/urw/NimbusSanL-BolIta.cff
+if not exist generated/NimbusSanL-Reg.c fontdump.exe generated/NimbusSanL-Reg.c resources/fonts/urw/NimbusSanL-Reg.cff
+if not exist generated/NimbusSanL-RegIta.c fontdump.exe generated/NimbusSanL-RegIta.c resources/fonts/urw/NimbusSanL-RegIta.cff
+if not exist generated/StandardSymL.c fontdump.exe resources/fonts/urw/StandardSymL.c resources/fonts/urw/StandardSymL.cff
-if not exist generated/NotoEmoji-Regular.ttf fontdump.exe generated/NotoEmoji-Regular.ttf resources/fonts/noto/NotoEmoji-Regular.ttf
-if not exist generated/NotoKufiArabic-Regular.ttf fontdump.exe generated/NotoKufiArabic-Regular.ttf resources/fonts/noto/NotoKufiArabic-Regular.ttf
-if not exist generated/NotoNaskhArabic-Regular.ttf fontdump.exe generated/NotoNaskhArabic-Regular.ttf resources/fonts/noto/NotoNaskhArabic-Regular.ttf
-if not exist generated/NotoNastaliqUrdu-Regular.ttf fontdump.exe generated/NotoNastaliqUrdu-Regular.ttf resources/fonts/noto/NotoNastaliqUrdu-Regular.ttf
-if not exist generated/NotoSans-Regular.ttf fontdump.exe generated/NotoSans-Regular.ttf resources/fonts/noto/NotoSans-Regular.ttf
-if not exist generated/NotoSansArmenian-Regular.ttf fontdump.exe generated/NotoSansArmenian-Regular.ttf resources/fonts/noto/NotoSansArmenian-Regular.ttf
-if not exist generated/NotoSansAvestan-Regular.ttf fontdump.exe generated/NotoSansAvestan-Regular.ttf resources/fonts/noto/NotoSansAvestan-Regular.ttf
-if not exist generated/NotoSansBalinese-Regular.ttf fontdump.exe generated/NotoSansBalinese-Regular.ttf resources/fonts/noto/NotoSansBalinese-Regular.ttf
-if not exist generated/NotoSansBamum-Regular.ttf fontdump.exe generated/NotoSansBamum-Regular.ttf resources/fonts/noto/NotoSansBamum-Regular.ttf
-if not exist generated/NotoSansBatak-Regular.ttf fontdump.exe generated/NotoSansBatak-Regular.ttf resources/fonts/noto/NotoSansBatak-Regular.ttf
-if not exist generated/NotoSansBengali-Regular.ttf fontdump.exe generated/NotoSansBengali-Regular.ttf resources/fonts/noto/NotoSansBengali-Regular.ttf
-if not exist generated/NotoSansBrahmi-Regular.ttf fontdump.exe generated/NotoSansBrahmi-Regular.ttf resources/fonts/noto/NotoSansBrahmi-Regular.ttf
-if not exist generated/NotoSansBuginese-Regular.ttf fontdump.exe generated/NotoSansBuginese-Regular.ttf resources/fonts/noto/NotoSansBuginese-Regular.ttf
-if not exist generated/NotoSansBuhid-Regular.ttf fontdump.exe generated/NotoSansBuhid-Regular.ttf resources/fonts/noto/NotoSansBuhid-Regular.ttf
-if not exist generated/NotoSansCanadianAboriginal-Regular.ttf fontdump.exe generated/NotoSansCanadianAboriginal-Regular.ttf resources/fonts/noto/NotoSansCanadianAboriginal-Regular.ttf
-if not exist generated/NotoSansCarian-Regular.ttf fontdump.exe generated/NotoSansCarian-Regular.ttf resources/fonts/noto/NotoSansCarian-Regular.ttf
-if not exist generated/NotoSansCham-Regular.ttf fontdump.exe generated/NotoSansCham-Regular.ttf resources/fonts/noto/NotoSansCham-Regular.ttf
-if not exist generated/NotoSansCherokee-Regular.ttf fontdump.exe generated/NotoSansCherokee-Regular.ttf resources/fonts/noto/NotoSansCherokee-Regular.ttf
-if not exist generated/NotoSansCoptic-Regular.ttf fontdump.exe generated/NotoSansCoptic-Regular.ttf resources/fonts/noto/NotoSansCoptic-Regular.ttf
-if not exist generated/NotoSansCuneiform-Regular.ttf fontdump.exe generated/NotoSansCuneiform-Regular.ttf resources/fonts/noto/NotoSansCuneiform-Regular.ttf
-if not exist generated/NotoSansCypriot-Regular.ttf fontdump.exe generated/NotoSansCypriot-Regular.ttf resources/fonts/noto/NotoSansCypriot-Regular.ttf
-if not exist generated/NotoSansDeseret-Regular.ttf fontdump.exe generated/NotoSansDeseret-Regular.ttf resources/fonts/noto/NotoSansDeseret-Regular.ttf
-if not exist generated/NotoSansDevanagari-Regular.ttf fontdump.exe generated/NotoSansDevanagari-Regular.ttf resources/fonts/noto/NotoSansDevanagari-Regular.ttf
-if not exist generated/NotoSansEgyptianHieroglyphs-Regular.ttf fontdump.exe generated/NotoSansEgyptianHieroglyphs-Regular.ttf resources/fonts/noto/NotoSansEgyptianHieroglyphs-Regular.ttf
-if not exist generated/NotoSansEthiopic-Regular.ttf fontdump.exe generated/NotoSansEthiopic-Regular.ttf resources/fonts/noto/NotoSansEthiopic-Regular.ttf
-if not exist generated/NotoSansGeorgian-Regular.ttf fontdump.exe generated/NotoSansGeorgian-Regular.ttf resources/fonts/noto/NotoSansGeorgian-Regular.ttf
-if not exist generated/NotoSansGlagolitic-Regular.ttf fontdump.exe generated/NotoSansGlagolitic-Regular.ttf resources/fonts/noto/NotoSansGlagolitic-Regular.ttf
-if not exist generated/NotoSansGothic-Regular.ttf fontdump.exe generated/NotoSansGothic-Regular.ttf resources/fonts/noto/NotoSansGothic-Regular.ttf
-if not exist generated/NotoSansGujarati-Regular.ttf fontdump.exe generated/NotoSansGujarati-Regular.ttf resources/fonts/noto/NotoSansGujarati-Regular.ttf
-if not exist generated/NotoSansGurmukhi-Regular.ttf fontdump.exe generated/NotoSansGurmukhi-Regular.ttf resources/fonts/noto/NotoSansGurmukhi-Regular.ttf
-if not exist generated/NotoSansHanunoo-Regular.ttf fontdump.exe generated/NotoSansHanunoo-Regular.ttf resources/fonts/noto/NotoSansHanunoo-Regular.ttf
-if not exist generated/NotoSansHebrew-Regular.ttf fontdump.exe generated/NotoSansHebrew-Regular.ttf resources/fonts/noto/NotoSansHebrew-Regular.ttf
-if not exist generated/NotoSansImperialAramaic-Regular.ttf fontdump.exe generated/NotoSansImperialAramaic-Regular.ttf resources/fonts/noto/NotoSansImperialAramaic-Regular.ttf
-if not exist generated/NotoSansInscriptionalPahlavi-Regular.ttf fontdump.exe generated/NotoSansInscriptionalPahlavi-Regular.ttf resources/fonts/noto/NotoSansInscriptionalPahlavi-Regular.ttf
-if not exist generated/NotoSansInscriptionalParthian-Regular.ttf fontdump.exe generated/NotoSansInscriptionalParthian-Regular.ttf resources/fonts/noto/NotoSansInscriptionalParthian-Regular.ttf
-if not exist generated/NotoSansJavanese-Regular.ttf fontdump.exe generated/NotoSansJavanese-Regular.ttf resources/fonts/noto/NotoSansJavanese-Regular.ttf
-if not exist generated/NotoSansKaithi-Regular.ttf fontdump.exe generated/NotoSansKaithi-Regular.ttf resources/fonts/noto/NotoSansKaithi-Regular.ttf
-if not exist generated/NotoSansKannada-Regular.ttf fontdump.exe generated/NotoSansKannada-Regular.ttf resources/fonts/noto/NotoSansKannada-Regular.ttf
-if not exist generated/NotoSansKayahLi-Regular.ttf fontdump.exe generated/NotoSansKayahLi-Regular.ttf resources/fonts/noto/NotoSansKayahLi-Regular.ttf
-if not exist generated/NotoSansKharoshthi-Regular.ttf fontdump.exe generated/NotoSansKharoshthi-Regular.ttf resources/fonts/noto/NotoSansKharoshthi-Regular.ttf
-if not exist generated/NotoSansKhmer-Regular.ttf fontdump.exe generated/NotoSansKhmer-Regular.ttf resources/fonts/noto/NotoSansKhmer-Regular.ttf
-if not exist generated/NotoSansLao-Regular.ttf fontdump.exe generated/NotoSansLao-Regular.ttf resources/fonts/noto/NotoSansLao-Regular.ttf
-if not exist generated/NotoSansLepcha-Regular.ttf fontdump.exe generated/NotoSansLepcha-Regular.ttf resources/fonts/noto/NotoSansLepcha-Regular.ttf
-if not exist generated/NotoSansLimbu-Regular.ttf fontdump.exe generated/NotoSansLimbu-Regular.ttf resources/fonts/noto/NotoSansLimbu-Regular.ttf
-if not exist generated/NotoSansLinearB-Regular.ttf fontdump.exe generated/NotoSansLinearB-Regular.ttf resources/fonts/noto/NotoSansLinearB-Regular.ttf
-if not exist generated/NotoSansLisu-Regular.ttf fontdump.exe generated/NotoSansLisu-Regular.ttf resources/fonts/noto/NotoSansLisu-Regular.ttf
-if not exist generated/NotoSansLycian-Regular.ttf fontdump.exe generated/NotoSansLycian-Regular.ttf resources/fonts/noto/NotoSansLycian-Regular.ttf
-if not exist generated/NotoSansLydian-Regular.ttf fontdump.exe generated/NotoSansLydian-Regular.ttf resources/fonts/noto/NotoSansLydian-Regular.ttf
-if not exist generated/NotoSansMalayalam-Regular.ttf fontdump.exe generated/NotoSansMalayalam-Regular.ttf resources/fonts/noto/NotoSansMalayalam-Regular.ttf
-if not exist generated/NotoSansMandaic-Regular.ttf fontdump.exe generated/NotoSansMandaic-Regular.ttf resources/fonts/noto/NotoSansMandaic-Regular.ttf
-if not exist generated/NotoSansMeeteiMayek-Regular.ttf fontdump.exe generated/NotoSansMeeteiMayek-Regular.ttf resources/fonts/noto/NotoSansMeeteiMayek-Regular.ttf
-if not exist generated/NotoSansMongolian-Regular.ttf fontdump.exe generated/NotoSansMongolian-Regular.ttf resources/fonts/noto/NotoSansMongolian-Regular.ttf
-if not exist generated/NotoSansMyanmar-Regular.ttf fontdump.exe generated/NotoSansMyanmar-Regular.ttf resources/fonts/noto/NotoSansMyanmar-Regular.ttf
-if not exist generated/NotoSansNKo-Regular.ttf fontdump.exe generated/NotoSansNKo-Regular.ttf resources/fonts/noto/NotoSansNKo-Regular.ttf
-if not exist generated/NotoSansNewTaiLue-Regular.ttf fontdump.exe generated/NotoSansNewTaiLue-Regular.ttf resources/fonts/noto/NotoSansNewTaiLue-Regular.ttf
-if not exist generated/NotoSansOgham-Regular.ttf fontdump.exe generated/NotoSansOgham-Regular.ttf resources/fonts/noto/NotoSansOgham-Regular.ttf
-if not exist generated/NotoSansOlChiki-Regular.ttf fontdump.exe generated/NotoSansOlChiki-Regular.ttf resources/fonts/noto/NotoSansOlChiki-Regular.ttf
-if not exist generated/NotoSansOldItalic-Regular.ttf fontdump.exe generated/NotoSansOldItalic-Regular.ttf resources/fonts/noto/NotoSansOldItalic-Regular.ttf
-if not exist generated/NotoSansOldPersian-Regular.ttf fontdump.exe generated/NotoSansOldPersian-Regular.ttf resources/fonts/noto/NotoSansOldPersian-Regular.ttf
-if not exist generated/NotoSansOldSouthArabian-Regular.ttf fontdump.exe generated/NotoSansOldSouthArabian-Regular.ttf resources/fonts/noto/NotoSansOldSouthArabian-Regular.ttf
-if not exist generated/NotoSansOldTurkic-Regular.ttf fontdump.exe generated/NotoSansOldTurkic-Regular.ttf resources/fonts/noto/NotoSansOldTurkic-Regular.ttf
-if not exist generated/NotoSansOriya-Regular.ttf fontdump.exe generated/NotoSansOriya-Regular.ttf resources/fonts/noto/NotoSansOriya-Regular.ttf
-if not exist generated/NotoSansOsmanya-Regular.ttf fontdump.exe generated/NotoSansOsmanya-Regular.ttf resources/fonts/noto/NotoSansOsmanya-Regular.ttf
-if not exist generated/NotoSansPhagsPa-Regular.ttf fontdump.exe generated/NotoSansPhagsPa-Regular.ttf resources/fonts/noto/NotoSansPhagsPa-Regular.ttf
-if not exist generated/NotoSansPhoenician-Regular.ttf fontdump.exe generated/NotoSansPhoenician-Regular.ttf resources/fonts/noto/NotoSansPhoenician-Regular.ttf
-if not exist generated/NotoSansRejang-Regular.ttf fontdump.exe generated/NotoSansRejang-Regular.ttf resources/fonts/noto/NotoSansRejang-Regular.ttf
-if not exist generated/NotoSansRunic-Regular.ttf fontdump.exe generated/NotoSansRunic-Regular.ttf resources/fonts/noto/NotoSansRunic-Regular.ttf
-if not exist generated/NotoSansSamaritan-Regular.ttf fontdump.exe generated/NotoSansSamaritan-Regular.ttf resources/fonts/noto/NotoSansSamaritan-Regular.ttf
-if not exist generated/NotoSansSaurashtra-Regular.ttf fontdump.exe generated/NotoSansSaurashtra-Regular.ttf resources/fonts/noto/NotoSansSaurashtra-Regular.ttf
-if not exist generated/NotoSansShavian-Regular.ttf fontdump.exe generated/NotoSansShavian-Regular.ttf resources/fonts/noto/NotoSansShavian-Regular.ttf
-if not exist generated/NotoSansSinhala-Regular.ttf fontdump.exe generated/NotoSansSinhala-Regular.ttf resources/fonts/noto/NotoSansSinhala-Regular.ttf
-if not exist generated/NotoSansSundanese-Regular.ttf fontdump.exe generated/NotoSansSundanese-Regular.ttf resources/fonts/noto/NotoSansSundanese-Regular.ttf
-if not exist generated/NotoSansSylotiNagri-Regular.ttf fontdump.exe generated/NotoSansSylotiNagri-Regular.ttf resources/fonts/noto/NotoSansSylotiNagri-Regular.ttf
-if not exist generated/NotoSansSymbols-Regular.ttf fontdump.exe generated/NotoSansSymbols-Regular.ttf resources/fonts/noto/NotoSansSymbols-Regular.ttf
-if not exist generated/NotoSansSyriacEastern-Regular.ttf fontdump.exe generated/NotoSansSyriacEastern-Regular.ttf resources/fonts/noto/NotoSansSyriacEastern-Regular.ttf
-if not exist generated/NotoSansSyriacEstrangela-Regular.ttf fontdump.exe generated/NotoSansSyriacEstrangela-Regular.ttf resources/fonts/noto/NotoSansSyriacEstrangela-Regular.ttf
-if not exist generated/NotoSansSyriacWestern-Regular.ttf fontdump.exe generated/NotoSansSyriacWestern-Regular.ttf resources/fonts/noto/NotoSansSyriacWestern-Regular.ttf
-if not exist generated/NotoSansTagalog-Regular.ttf fontdump.exe generated/NotoSansTagalog-Regular.ttf resources/fonts/noto/NotoSansTagalog-Regular.ttf
-if not exist generated/NotoSansTagbanwa-Regular.ttf fontdump.exe generated/NotoSansTagbanwa-Regular.ttf resources/fonts/noto/NotoSansTagbanwa-Regular.ttf
-if not exist generated/NotoSansTaiLe-Regular.ttf fontdump.exe generated/NotoSansTaiLe-Regular.ttf resources/fonts/noto/NotoSansTaiLe-Regular.ttf
-if not exist generated/NotoSansTaiTham-Regular.ttf fontdump.exe generated/NotoSansTaiTham-Regular.ttf resources/fonts/noto/NotoSansTaiTham-Regular.ttf
-if not exist generated/NotoSansTaiViet-Regular.ttf fontdump.exe generated/NotoSansTaiViet-Regular.ttf resources/fonts/noto/NotoSansTaiViet-Regular.ttf
-if not exist generated/NotoSansTamil-Regular.ttf fontdump.exe generated/NotoSansTamil-Regular.ttf resources/fonts/noto/NotoSansTamil-Regular.ttf
-if not exist generated/NotoSansTelugu-Regular.ttf fontdump.exe generated/NotoSansTelugu-Regular.ttf resources/fonts/noto/NotoSansTelugu-Regular.ttf
-if not exist generated/NotoSansThaana-Regular.ttf fontdump.exe generated/NotoSansThaana-Regular.ttf resources/fonts/noto/NotoSansThaana-Regular.ttf
-if not exist generated/NotoSansThai-Regular.ttf fontdump.exe generated/NotoSansThai-Regular.ttf resources/fonts/noto/NotoSansThai-Regular.ttf
-if not exist generated/NotoSansTibetan-Regular.ttf fontdump.exe generated/NotoSansTibetan-Regular.ttf resources/fonts/noto/NotoSansTibetan-Regular.ttf
-if not exist generated/NotoSansTifinagh-Regular.ttf fontdump.exe generated/NotoSansTifinagh-Regular.ttf resources/fonts/noto/NotoSansTifinagh-Regular.ttf
-if not exist generated/NotoSansUgaritic-Regular.ttf fontdump.exe generated/NotoSansUgaritic-Regular.ttf resources/fonts/noto/NotoSansUgaritic-Regular.ttf
-if not exist generated/NotoSansVai-Regular.ttf fontdump.exe generated/NotoSansVai-Regular.ttf resources/fonts/noto/NotoSansVai-Regular.ttf
-if not exist generated/NotoSansYi-Regular.ttf fontdump.exe generated/NotoSansYi-Regular.ttf resources/fonts/noto/NotoSansYi-Regular.ttf
-if not exist generated/NotoSerif-Regular.ttf fontdump.exe generated/NotoSerif-Regular.ttf resources/fonts/noto/NotoSerif-Regular.ttf
-if not exist generated/NotoSerifArmenian-Regular.ttf fontdump.exe generated/NotoSerifArmenian-Regular.ttf resources/fonts/noto/NotoSerifArmenian-Regular.ttf
-if not exist generated/NotoSerifBengali-Regular.ttf fontdump.exe generated/NotoSerifBengali-Regular.ttf resources/fonts/noto/NotoSerifBengali-Regular.ttf
-if not exist generated/NotoSerifGeorgian-Regular.ttf fontdump.exe generated/NotoSerifGeorgian-Regular.ttf resources/fonts/noto/NotoSerifGeorgian-Regular.ttf
-if not exist generated/NotoSerifGujarati-Regular.ttf fontdump.exe generated/NotoSerifGujarati-Regular.ttf resources/fonts/noto/NotoSerifGujarati-Regular.ttf
-if not exist generated/NotoSerifKannada-Regular.ttf fontdump.exe generated/NotoSerifKannada-Regular.ttf resources/fonts/noto/NotoSerifKannada-Regular.ttf
-if not exist generated/NotoSerifKhmer-Regular.ttf fontdump.exe generated/NotoSerifKhmer-Regular.ttf resources/fonts/noto/NotoSerifKhmer-Regular.ttf
-if not exist generated/NotoSerifLao-Regular.ttf fontdump.exe generated/NotoSerifLao-Regular.ttf resources/fonts/noto/NotoSerifLao-Regular.ttf
-if not exist generated/NotoSerifMalayalam-Regular.ttf fontdump.exe generated/NotoSerifMalayalam-Regular.ttf resources/fonts/noto/NotoSerifMalayalam-Regular.ttf
-if not exist generated/NotoSerifTamil-Regular.ttf fontdump.exe generated/NotoSerifTamil-Regular.ttf resources/fonts/noto/NotoSerifTamil-Regular.ttf
-if not exist generated/NotoSerifTelugu-Regular.ttf fontdump.exe generated/NotoSerifTelugu-Regular.ttf resources/fonts/noto/NotoSerifTelugu-Regular.ttf
-if not exist generated/NotoSerifThai-Regular.ttf fontdump.exe generated/NotoSerifThai-Regular.ttf resources/fonts/noto/NotoSerifThai-Regular.ttf
+if not exist generated/NotoEmoji-Regular.c fontdump.exe generated/NotoEmoji-Regular.c resources/fonts/noto/NotoEmoji-Regular.ttf
+if not exist generated/NotoKufiArabic-Regular.c fontdump.exe generated/NotoKufiArabic-Regular.c resources/fonts/noto/NotoKufiArabic-Regular.ttf
+if not exist generated/NotoNaskhArabic-Regular.c fontdump.exe generated/NotoNaskhArabic-Regular.c resources/fonts/noto/NotoNaskhArabic-Regular.ttf
+if not exist generated/NotoNastaliqUrdu-Regular.c fontdump.exe generated/NotoNastaliqUrdu-Regular.c resources/fonts/noto/NotoNastaliqUrdu-Regular.ttf
+if not exist generated/NotoSans-Regular.c fontdump.exe generated/NotoSans-Regular.c resources/fonts/noto/NotoSans-Regular.ttf
+if not exist generated/NotoSansArmenian-Regular.c fontdump.exe generated/NotoSansArmenian-Regular.c resources/fonts/noto/NotoSansArmenian-Regular.ttf
+if not exist generated/NotoSansAvestan-Regular.c fontdump.exe generated/NotoSansAvestan-Regular.c resources/fonts/noto/NotoSansAvestan-Regular.ttf
+if not exist generated/NotoSansBalinese-Regular.c fontdump.exe generated/NotoSansBalinese-Regular.c resources/fonts/noto/NotoSansBalinese-Regular.ttf
+if not exist generated/NotoSansBamum-Regular.c fontdump.exe generated/NotoSansBamum-Regular.c resources/fonts/noto/NotoSansBamum-Regular.ttf
+if not exist generated/NotoSansBatak-Regular.c fontdump.exe generated/NotoSansBatak-Regular.c resources/fonts/noto/NotoSansBatak-Regular.ttf
+if not exist generated/NotoSansBengali-Regular.c fontdump.exe generated/NotoSansBengali-Regular.c resources/fonts/noto/NotoSansBengali-Regular.ttf
+if not exist generated/NotoSansBrahmi-Regular.c fontdump.exe generated/NotoSansBrahmi-Regular.c resources/fonts/noto/NotoSansBrahmi-Regular.ttf
+if not exist generated/NotoSansBuginese-Regular.c fontdump.exe generated/NotoSansBuginese-Regular.c resources/fonts/noto/NotoSansBuginese-Regular.ttf
+if not exist generated/NotoSansBuhid-Regular.c fontdump.exe generated/NotoSansBuhid-Regular.c resources/fonts/noto/NotoSansBuhid-Regular.ttf
+if not exist generated/NotoSansCanadianAboriginal-Regular.c fontdump.exe generated/NotoSansCanadianAboriginal-Regular.c resources/fonts/noto/NotoSansCanadianAboriginal-Regular.ttf
+if not exist generated/NotoSansCarian-Regular.c fontdump.exe generated/NotoSansCarian-Regular.c resources/fonts/noto/NotoSansCarian-Regular.ttf
+if not exist generated/NotoSansCham-Regular.c fontdump.exe generated/NotoSansCham-Regular.c resources/fonts/noto/NotoSansCham-Regular.ttf
+if not exist generated/NotoSansCherokee-Regular.c fontdump.exe generated/NotoSansCherokee-Regular.c resources/fonts/noto/NotoSansCherokee-Regular.ttf
+if not exist generated/NotoSansCoptic-Regular.c fontdump.exe generated/NotoSansCoptic-Regular.c resources/fonts/noto/NotoSansCoptic-Regular.ttf
+if not exist generated/NotoSansCuneiform-Regular.c fontdump.exe generated/NotoSansCuneiform-Regular.c resources/fonts/noto/NotoSansCuneiform-Regular.ttf
+if not exist generated/NotoSansCypriot-Regular.c fontdump.exe generated/NotoSansCypriot-Regular.c resources/fonts/noto/NotoSansCypriot-Regular.ttf
+if not exist generated/NotoSansDeseret-Regular.c fontdump.exe generated/NotoSansDeseret-Regular.c resources/fonts/noto/NotoSansDeseret-Regular.ttf
+if not exist generated/NotoSansDevanagari-Regular.c fontdump.exe generated/NotoSansDevanagari-Regular.c resources/fonts/noto/NotoSansDevanagari-Regular.ttf
+if not exist generated/NotoSansEgyptianHieroglyphs-Regular.c fontdump.exe generated/NotoSansEgyptianHieroglyphs-Regular.c resources/fonts/noto/NotoSansEgyptianHieroglyphs-Regular.ttf
+if not exist generated/NotoSansEthiopic-Regular.c fontdump.exe generated/NotoSansEthiopic-Regular.c resources/fonts/noto/NotoSansEthiopic-Regular.ttf
+if not exist generated/NotoSansGeorgian-Regular.c fontdump.exe generated/NotoSansGeorgian-Regular.c resources/fonts/noto/NotoSansGeorgian-Regular.ttf
+if not exist generated/NotoSansGlagolitic-Regular.c fontdump.exe generated/NotoSansGlagolitic-Regular.c resources/fonts/noto/NotoSansGlagolitic-Regular.ttf
+if not exist generated/NotoSansGothic-Regular.c fontdump.exe generated/NotoSansGothic-Regular.c resources/fonts/noto/NotoSansGothic-Regular.ttf
+if not exist generated/NotoSansGujarati-Regular.c fontdump.exe generated/NotoSansGujarati-Regular.c resources/fonts/noto/NotoSansGujarati-Regular.ttf
+if not exist generated/NotoSansGurmukhi-Regular.c fontdump.exe generated/NotoSansGurmukhi-Regular.c resources/fonts/noto/NotoSansGurmukhi-Regular.ttf
+if not exist generated/NotoSansHanunoo-Regular.c fontdump.exe generated/NotoSansHanunoo-Regular.c resources/fonts/noto/NotoSansHanunoo-Regular.ttf
+if not exist generated/NotoSansHebrew-Regular.c fontdump.exe generated/NotoSansHebrew-Regular.c resources/fonts/noto/NotoSansHebrew-Regular.ttf
+if not exist generated/NotoSansImperialAramaic-Regular.c fontdump.exe generated/NotoSansImperialAramaic-Regular.c resources/fonts/noto/NotoSansImperialAramaic-Regular.ttf
+if not exist generated/NotoSansInscriptionalPahlavi-Regular.c fontdump.exe generated/NotoSansInscriptionalPahlavi-Regular.c resources/fonts/noto/NotoSansInscriptionalPahlavi-Regular.ttf
+if not exist generated/NotoSansInscriptionalParthian-Regular.c fontdump.exe generated/NotoSansInscriptionalParthian-Regular.c resources/fonts/noto/NotoSansInscriptionalParthian-Regular.ttf
+if not exist generated/NotoSansJavanese-Regular.c fontdump.exe generated/NotoSansJavanese-Regular.c resources/fonts/noto/NotoSansJavanese-Regular.ttf
+if not exist generated/NotoSansKaithi-Regular.c fontdump.exe generated/NotoSansKaithi-Regular.c resources/fonts/noto/NotoSansKaithi-Regular.ttf
+if not exist generated/NotoSansKannada-Regular.c fontdump.exe generated/NotoSansKannada-Regular.c resources/fonts/noto/NotoSansKannada-Regular.ttf
+if not exist generated/NotoSansKayahLi-Regular.c fontdump.exe generated/NotoSansKayahLi-Regular.c resources/fonts/noto/NotoSansKayahLi-Regular.ttf
+if not exist generated/NotoSansKharoshthi-Regular.c fontdump.exe generated/NotoSansKharoshthi-Regular.c resources/fonts/noto/NotoSansKharoshthi-Regular.ttf
+if not exist generated/NotoSansKhmer-Regular.c fontdump.exe generated/NotoSansKhmer-Regular.c resources/fonts/noto/NotoSansKhmer-Regular.ttf
+if not exist generated/NotoSansLao-Regular.c fontdump.exe generated/NotoSansLao-Regular.c resources/fonts/noto/NotoSansLao-Regular.ttf
+if not exist generated/NotoSansLepcha-Regular.c fontdump.exe generated/NotoSansLepcha-Regular.c resources/fonts/noto/NotoSansLepcha-Regular.ttf
+if not exist generated/NotoSansLimbu-Regular.c fontdump.exe generated/NotoSansLimbu-Regular.c resources/fonts/noto/NotoSansLimbu-Regular.ttf
+if not exist generated/NotoSansLinearB-Regular.c fontdump.exe generated/NotoSansLinearB-Regular.c resources/fonts/noto/NotoSansLinearB-Regular.ttf
+if not exist generated/NotoSansLisu-Regular.c fontdump.exe generated/NotoSansLisu-Regular.c resources/fonts/noto/NotoSansLisu-Regular.ttf
+if not exist generated/NotoSansLycian-Regular.c fontdump.exe generated/NotoSansLycian-Regular.c resources/fonts/noto/NotoSansLycian-Regular.ttf
+if not exist generated/NotoSansLydian-Regular.c fontdump.exe generated/NotoSansLydian-Regular.c resources/fonts/noto/NotoSansLydian-Regular.ttf
+if not exist generated/NotoSansMalayalam-Regular.c fontdump.exe generated/NotoSansMalayalam-Regular.c resources/fonts/noto/NotoSansMalayalam-Regular.ttf
+if not exist generated/NotoSansMandaic-Regular.c fontdump.exe generated/NotoSansMandaic-Regular.c resources/fonts/noto/NotoSansMandaic-Regular.ttf
+if not exist generated/NotoSansMeeteiMayek-Regular.c fontdump.exe generated/NotoSansMeeteiMayek-Regular.c resources/fonts/noto/NotoSansMeeteiMayek-Regular.ttf
+if not exist generated/NotoSansMongolian-Regular.c fontdump.exe generated/NotoSansMongolian-Regular.c resources/fonts/noto/NotoSansMongolian-Regular.ttf
+if not exist generated/NotoSansMyanmar-Regular.c fontdump.exe generated/NotoSansMyanmar-Regular.c resources/fonts/noto/NotoSansMyanmar-Regular.ttf
+if not exist generated/NotoSansNKo-Regular.c fontdump.exe generated/NotoSansNKo-Regular.c resources/fonts/noto/NotoSansNKo-Regular.ttf
+if not exist generated/NotoSansNewTaiLue-Regular.c fontdump.exe generated/NotoSansNewTaiLue-Regular.c resources/fonts/noto/NotoSansNewTaiLue-Regular.ttf
+if not exist generated/NotoSansOgham-Regular.c fontdump.exe generated/NotoSansOgham-Regular.c resources/fonts/noto/NotoSansOgham-Regular.ttf
+if not exist generated/NotoSansOlChiki-Regular.c fontdump.exe generated/NotoSansOlChiki-Regular.c resources/fonts/noto/NotoSansOlChiki-Regular.ttf
+if not exist generated/NotoSansOldItalic-Regular.c fontdump.exe generated/NotoSansOldItalic-Regular.c resources/fonts/noto/NotoSansOldItalic-Regular.ttf
+if not exist generated/NotoSansOldPersian-Regular.c fontdump.exe generated/NotoSansOldPersian-Regular.c resources/fonts/noto/NotoSansOldPersian-Regular.ttf
+if not exist generated/NotoSansOldSouthArabian-Regular.c fontdump.exe generated/NotoSansOldSouthArabian-Regular.c resources/fonts/noto/NotoSansOldSouthArabian-Regular.ttf
+if not exist generated/NotoSansOldTurkic-Regular.c fontdump.exe generated/NotoSansOldTurkic-Regular.c resources/fonts/noto/NotoSansOldTurkic-Regular.ttf
+if not exist generated/NotoSansOriya-Regular.c fontdump.exe generated/NotoSansOriya-Regular.c resources/fonts/noto/NotoSansOriya-Regular.ttf
+if not exist generated/NotoSansOsmanya-Regular.c fontdump.exe generated/NotoSansOsmanya-Regular.c resources/fonts/noto/NotoSansOsmanya-Regular.ttf
+if not exist generated/NotoSansPhagsPa-Regular.c fontdump.exe generated/NotoSansPhagsPa-Regular.c resources/fonts/noto/NotoSansPhagsPa-Regular.ttf
+if not exist generated/NotoSansPhoenician-Regular.c fontdump.exe generated/NotoSansPhoenician-Regular.c resources/fonts/noto/NotoSansPhoenician-Regular.ttf
+if not exist generated/NotoSansRejang-Regular.c fontdump.exe generated/NotoSansRejang-Regular.c resources/fonts/noto/NotoSansRejang-Regular.ttf
+if not exist generated/NotoSansRunic-Regular.c fontdump.exe generated/NotoSansRunic-Regular.c resources/fonts/noto/NotoSansRunic-Regular.ttf
+if not exist generated/NotoSansSamaritan-Regular.c fontdump.exe generated/NotoSansSamaritan-Regular.c resources/fonts/noto/NotoSansSamaritan-Regular.ttf
+if not exist generated/NotoSansSaurashtra-Regular.c fontdump.exe generated/NotoSansSaurashtra-Regular.c resources/fonts/noto/NotoSansSaurashtra-Regular.ttf
+if not exist generated/NotoSansShavian-Regular.c fontdump.exe generated/NotoSansShavian-Regular.c resources/fonts/noto/NotoSansShavian-Regular.ttf
+if not exist generated/NotoSansSinhala-Regular.c fontdump.exe generated/NotoSansSinhala-Regular.c resources/fonts/noto/NotoSansSinhala-Regular.ttf
+if not exist generated/NotoSansSundanese-Regular.c fontdump.exe generated/NotoSansSundanese-Regular.c resources/fonts/noto/NotoSansSundanese-Regular.ttf
+if not exist generated/NotoSansSylotiNagri-Regular.c fontdump.exe generated/NotoSansSylotiNagri-Regular.c resources/fonts/noto/NotoSansSylotiNagri-Regular.ttf
+if not exist generated/NotoSansSymbols-Regular.c fontdump.exe generated/NotoSansSymbols-Regular.c resources/fonts/noto/NotoSansSymbols-Regular.ttf
+if not exist generated/NotoSansSyriacEastern-Regular.c fontdump.exe generated/NotoSansSyriacEastern-Regular.c resources/fonts/noto/NotoSansSyriacEastern-Regular.ttf
+if not exist generated/NotoSansSyriacEstrangela-Regular.c fontdump.exe generated/NotoSansSyriacEstrangela-Regular.c resources/fonts/noto/NotoSansSyriacEstrangela-Regular.ttf
+if not exist generated/NotoSansSyriacWestern-Regular.c fontdump.exe generated/NotoSansSyriacWestern-Regular.c resources/fonts/noto/NotoSansSyriacWestern-Regular.ttf
+if not exist generated/NotoSansTagalog-Regular.c fontdump.exe generated/NotoSansTagalog-Regular.c resources/fonts/noto/NotoSansTagalog-Regular.ttf
+if not exist generated/NotoSansTagbanwa-Regular.c fontdump.exe generated/NotoSansTagbanwa-Regular.c resources/fonts/noto/NotoSansTagbanwa-Regular.ttf
+if not exist generated/NotoSansTaiLe-Regular.c fontdump.exe generated/NotoSansTaiLe-Regular.c resources/fonts/noto/NotoSansTaiLe-Regular.ttf
+if not exist generated/NotoSansTaiTham-Regular.c fontdump.exe generated/NotoSansTaiTham-Regular.c resources/fonts/noto/NotoSansTaiTham-Regular.ttf
+if not exist generated/NotoSansTaiViet-Regular.c fontdump.exe generated/NotoSansTaiViet-Regular.c resources/fonts/noto/NotoSansTaiViet-Regular.ttf
+if not exist generated/NotoSansTamil-Regular.c fontdump.exe generated/NotoSansTamil-Regular.c resources/fonts/noto/NotoSansTamil-Regular.ttf
+if not exist generated/NotoSansTelugu-Regular.c fontdump.exe generated/NotoSansTelugu-Regular.c resources/fonts/noto/NotoSansTelugu-Regular.ttf
+if not exist generated/NotoSansThaana-Regular.c fontdump.exe generated/NotoSansThaana-Regular.c resources/fonts/noto/NotoSansThaana-Regular.ttf
+if not exist generated/NotoSansThai-Regular.c fontdump.exe generated/NotoSansThai-Regular.c resources/fonts/noto/NotoSansThai-Regular.ttf
+if not exist generated/NotoSansTibetan-Regular.c fontdump.exe generated/NotoSansTibetan-Regular.c resources/fonts/noto/NotoSansTibetan-Regular.ttf
+if not exist generated/NotoSansTifinagh-Regular.c fontdump.exe generated/NotoSansTifinagh-Regular.c resources/fonts/noto/NotoSansTifinagh-Regular.ttf
+if not exist generated/NotoSansUgaritic-Regular.c fontdump.exe generated/NotoSansUgaritic-Regular.c resources/fonts/noto/NotoSansUgaritic-Regular.ttf
+if not exist generated/NotoSansVai-Regular.c fontdump.exe generated/NotoSansVai-Regular.c resources/fonts/noto/NotoSansVai-Regular.ttf
+if not exist generated/NotoSansYi-Regular.c fontdump.exe generated/NotoSansYi-Regular.c resources/fonts/noto/NotoSansYi-Regular.ttf
+if not exist generated/NotoSerif-Regular.c fontdump.exe generated/NotoSerif-Regular.c resources/fonts/noto/NotoSerif-Regular.ttf
+if not exist generated/NotoSerifArmenian-Regular.c fontdump.exe generated/NotoSerifArmenian-Regular.c resources/fonts/noto/NotoSerifArmenian-Regular.ttf
+if not exist generated/NotoSerifBengali-Regular.c fontdump.exe generated/NotoSerifBengali-Regular.c resources/fonts/noto/NotoSerifBengali-Regular.ttf
+if not exist generated/NotoSerifGeorgian-Regular.c fontdump.exe generated/NotoSerifGeorgian-Regular.c resources/fonts/noto/NotoSerifGeorgian-Regular.ttf
+if not exist generated/NotoSerifGujarati-Regular.c fontdump.exe generated/NotoSerifGujarati-Regular.c resources/fonts/noto/NotoSerifGujarati-Regular.ttf
+if not exist generated/NotoSerifKannada-Regular.c fontdump.exe generated/NotoSerifKannada-Regular.c resources/fonts/noto/NotoSerifKannada-Regular.ttf
+if not exist generated/NotoSerifKhmer-Regular.c fontdump.exe generated/NotoSerifKhmer-Regular.c resources/fonts/noto/NotoSerifKhmer-Regular.ttf
+if not exist generated/NotoSerifLao-Regular.c fontdump.exe generated/NotoSerifLao-Regular.c resources/fonts/noto/NotoSerifLao-Regular.ttf
+if not exist generated/NotoSerifMalayalam-Regular.c fontdump.exe generated/NotoSerifMalayalam-Regular.c resources/fonts/noto/NotoSerifMalayalam-Regular.ttf
+if not exist generated/NotoSerifTamil-Regular.c fontdump.exe generated/NotoSerifTamil-Regular.c resources/fonts/noto/NotoSerifTamil-Regular.ttf
+if not exist generated/NotoSerifTelugu-Regular.c fontdump.exe generated/NotoSerifTelugu-Regular.c resources/fonts/noto/NotoSerifTelugu-Regular.ttf
+if not exist generated/NotoSerifThai-Regular.c fontdump.exe generated/NotoSerifThai-Regular.c resources/fonts/noto/NotoSerifThai-Regular.ttf
del cmapdump.obj fontdump.obj cquote.obj bin2hex.obj cmapdump.exe fontdump.exe cquote.exe bin2hex.exe
diff --git a/platform/win32/libfonts.vcproj b/platform/win32/libfonts.vcproj
new file mode 100644
index 00000000..8071eb28
--- /dev/null
+++ b/platform/win32/libfonts.vcproj
@@ -0,0 +1,627 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libfonts"
+ ProjectGUID="{52DCAB29-C8EE-4422-954C-29AFA6B33E22}"
+ RootNamespace="libfonts"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ GenerateDebugInformation="true"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\generated\Dingbats.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\DroidSansFallback.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\DroidSansFallbackFull.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusMono-Bold.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusMono-BoldOblique.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusMono-Oblique.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusMono-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusRomNo9L-Med.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusRomNo9L-MedIta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusRomNo9L-Reg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusRomNo9L-RegIta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusSanL-Bol.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusSanL-BolIta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusSanL-Reg.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NimbusSanL-RegIta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoEmoji-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoKufiArabic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoNaskhArabic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoNastaliqUrdu-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSans-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansArmenian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansAvestan-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBalinese-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBamum-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBatak-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBengali-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBrahmi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBuginese-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansBuhid-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCanadianAboriginal-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCarian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCham-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCherokee-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCoptic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCuneiform-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansCypriot-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansDeseret-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansDevanagari-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansEgyptianHieroglyphs-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansEthiopic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansGeorgian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansGlagolitic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansGothic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansGujarati-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansGurmukhi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansHanunoo-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansHebrew-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansImperialAramaic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansInscriptionalPahlavi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansInscriptionalParthian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansJavanese-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansKaithi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansKannada-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansKayahLi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansKharoshthi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansKhmer-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLao-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLepcha-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLimbu-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLinearB-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLisu-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLycian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansLydian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansMalayalam-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansMandaic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansMeeteiMayek-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansMongolian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansMyanmar-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansNewTaiLue-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansNKo-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOgham-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOlChiki-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOldItalic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOldPersian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOldSouthArabian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOldTurkic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOriya-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansOsmanya-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansPhagsPa-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansPhoenician-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansRejang-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansRunic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSamaritan-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSaurashtra-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansShavian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSinhala-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSundanese-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSylotiNagri-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSymbols-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSyriacEastern-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSyriacEstrangela-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansSyriacWestern-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTagalog-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTagbanwa-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTaiLe-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTaiTham-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTaiViet-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTamil-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTelugu-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansThaana-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansThai-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTibetan-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansTifinagh-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansUgaritic-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansVai-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSansYi-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerif-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifArmenian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifBengali-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifGeorgian-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifGujarati-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifKannada-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifKhmer-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifLao-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifMalayalam-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifTamil-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifTelugu-Regular.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generated\NotoSerifThai-Regular.c"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj
index d56cb947..384e27cf 100644
--- a/platform/win32/libmupdf.vcproj
+++ b/platform/win32/libmupdf.vcproj
@@ -919,6 +919,10 @@
>
</File>
<File
+ RelativePath="..\..\source\fitz\load-bmp.c"
+ >
+ </File>
+ <File
RelativePath="..\..\source\fitz\load-gif.c"
>
</File>
diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln
index 52b9ca05..88f7777c 100644
--- a/platform/win32/mupdf.sln
+++ b/platform/win32/mupdf.sln
@@ -3,27 +3,28 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf", "mupdf.vcproj", "{E74F29F0-FA43-4ADC-B92C-6AFA08E4A417}"
ProjectSection(ProjectDependencies) = postProject
- {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+ {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthirdparty", "libthirdparty.vcproj", "{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf", "libmupdf.vcproj", "{5F615F91-DFF8-4F05-BF48-6222B7D86519}"
ProjectSection(ProjectDependencies) = postProject
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22} = {52DCAB29-C8EE-4422-954C-29AFA6B33E22}
{A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}"
ProjectSection(ProjectDependencies) = postProject
- {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+ {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", "{00811970-815B-4F64-BC9D-219078B1F3AA}"
ProjectSection(ProjectDependencies) = postProject
- {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+ {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}"
@@ -32,28 +33,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\thirdparty
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-curl", "mupdf-curl.vcproj", "{27B53E5C-ACAB-423C-854E-BECE56D73544}"
ProjectSection(ProjectDependencies) = postProject
- {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
- {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+ {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+ {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest", "mujstest.vcproj", "{21E28758-E4D2-4B84-8EC5-B631CEE66B30}"
ProjectSection(ProjectDependencies) = postProject
- {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
{5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+ {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglfw", "libglfw.vcproj", "{A1B75D29-9F5C-4A0F-B368-322A10477D0C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdf-gl", "mupdf-gl.vcproj", "{CE3A76A8-A28F-4991-8FB9-C9453D922037}"
ProjectSection(ProjectDependencies) = postProject
- {A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C}
- {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
{5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}
+ {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519}
+ {A1B75D29-9F5C-4A0F-B368-322A10477D0C} = {A1B75D29-9F5C-4A0F-B368-322A10477D0C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "jni.vcproj", "{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfonts", "libfonts.vcproj", "{52DCAB29-C8EE-4422-954C-29AFA6B33E22}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -303,6 +309,21 @@ Global
{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
{05A1CA5B-9807-4B3A-9954-EFAB8ADE7757}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.ActiveCfg = Debug|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|Win32.Build.0 = Debug|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Debug|x64.ActiveCfg = Debug|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|Win32.Build.0 = Debug|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.DebugOpenssl|x64.ActiveCfg = Debug|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.ActiveCfg = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|Win32.Build.0 = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Memento|x64.ActiveCfg = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.ActiveCfg = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|Win32.Build.0 = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.Release|x64.ActiveCfg = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|Win32.Build.0 = Release|Win32
+ {52DCAB29-C8EE-4422-954C-29AFA6B33E22}.ReleaseOpenssl|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/source/fitz/load-bmp.c b/source/fitz/load-bmp.c
index 0d53d565..19aefd25 100644
--- a/source/fitz/load-bmp.c
+++ b/source/fitz/load-bmp.c
@@ -436,12 +436,12 @@ bmp_decompress_rle4(fz_context *ctx, struct info *info, unsigned char *p, unsign
}
else if (sp[0] == 0 && sp[1] == 2)
{ /* delta */
- int deltax, deltay;
+ int deltax, deltay, startlow;
if (sp + 4 > *end)
break;
deltax = sp[2];
deltay = sp[3];
- int startlow = x & 1;
+ startlow = x & 1;
dp += (deltax + startlow) / 2 + deltay * stride;
sp += 4;
x += deltax;