Windows fixes

flake8 fixes
adobe-type-tools · Jun 25, 2024 · 1e35149 · 1e35149
1 parent c910ba8
commit 1e35149
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/c/sfntedit/sfntedit.cpp b/c/sfntedit/sfntedit.cpp
@@ -636,7 +636,7 @@ void SfntEdit::readHdr() {
         default:
             srcfile.close();
             fatal("unrecognized/unsupported file type [%s]",
-                  srcfilepath.c_str());
+                  srcfilepath.string().c_str());
     }
 
     /* Read rest of header */
@@ -667,7 +667,7 @@ void SfntEdit::readHdr() {
 void SfntEdit::dumpHdr(void) {
     int i = 0;
 
-    std::printf("--- sfnt header [%s]\n", srcfilepath.c_str());
+    std::printf("--- sfnt header [%s]\n", srcfilepath.string().c_str());
     if (sfnt.version == 0x00010000)
         std::printf("version      =1.0 (00010000)\n");
     else
@@ -781,7 +781,7 @@ void SfntEdit::checkChecksums() {
         fail = 1;
     }
     logger->log(sINFO, fail ? "icheck failed [%s]" : "check passed [%s]",
-                srcfilepath.c_str());
+                srcfilepath.string().c_str());
 }
 
 /* Make extract filename from option filename or src filename plus table tag */
@@ -868,7 +868,7 @@ uint32_t SfntEdit::addTable(const Table &tbl, std::ostream &dstfile,
 
     file.open(tbl.afilename, std::ios::binary);
     if (file.fail())
-        fatal("file error <could not open> [%s]", tbl.afilename.c_str());
+        fatal("file error <could not open> [%s]", tbl.afilename.string().c_str());
     file.seekg(0, std::ios::end);
     *length = (uint32_t) file.tellg();
     checksum = tableCopy(file, dstfile, 0, *length);
@@ -1019,7 +1019,7 @@ int SfntEdit::run_prot(int argc, char *argv[]) {
             scriptfilepath = "sfntedit.scr";
 
         if (!fs::exists(scriptfilepath)) {
-            fatal("Missing script file [%s]", scriptfilepath.c_str());
+            fatal("Missing script file [%s]", scriptfilepath.string().c_str());
         }
         makeArgs(scriptfilepath, script);
         if (scriptfilepath.has_parent_path())
@@ -1059,15 +1059,15 @@ int SfntEdit::run_prot(int argc, char *argv[]) {
 
         srcfile.open(srcfilepath, std::ios::binary);
         if (srcfile.fail())
-            fatal("file error <could not open> [%s]", srcfilepath.c_str());
+            fatal("file error <could not open> [%s]", srcfilepath.string().c_str());
 
         if (!doingScripting && srcfilepath.has_parent_path())
             sourcepath = srcfilepath.parent_path();
 
         if (!dstfilepath.empty()) {  // Open destination file
             dstfile.open(dstfilepath, std::ios::in|std::ios::out|std::ios::binary|std::ios::trunc);
             if (dstfile.fail())
-                fatal("file error <could not open> [%s]", dstfilepath.c_str());
+                fatal("file error <could not open> [%s]", dstfilepath.string().c_str());
         }
 
         /* Read sfnt header */

diff --git a/c/shared/include/designspace.h b/c/shared/include/designspace.h
@@ -11,9 +11,7 @@
 #include <map>
 #include <vector>
 
-#include "ctlshare.h"
 #include "slogger.h"
-#include "supportfp.h"
 #include "varsupport.h"
 
 class Designspace {

diff --git a/c/shared/include/supportfp.h b/c/shared/include/supportfp.h
@@ -21,17 +21,17 @@
    floor, frexp, ldexp, log, log10, modf, pow, sin, sqrt
  */
 
-#include <math.h>
-#include <stdint.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "math.h"
+#include "stdint.h"
 
 #ifndef FIXEDFUNC
 #define FIXEDFUNC
 #endif /* FIXEDFUNC */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Reals and Fixed point */
 typedef int32_t Fixed; /*  16 bits of integer, 16 bits of fraction */
 

diff --git a/cmake/ExternalAntlr4Cpp.cmake b/cmake/ExternalAntlr4Cpp.cmake
@@ -13,7 +13,8 @@ if(NOT DEFINED ANTLR4_TAG)
 endif()
 
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
-  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(Configuration))
+  # set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(Configuration))
+  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist)
 elseif(${CMAKE_GENERATOR} MATCHES "Xcode.*")
   set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(CONFIGURATION))
 else()

diff --git a/python/afdko/makeotf.py b/python/afdko/makeotf.py
@@ -1486,8 +1486,9 @@ def getOptions(makeOTFParams, args):
     if error:
         raise MakeOTFOptionsError
 
-    if (getattr(makeOTFParams, kFileOptPrefix + kRelease) != None and
-            getattr(makeOTFParams, kFileOptPrefix + kUseSuppliedCFF) != None):
+    if (getattr(makeOTFParams, kFileOptPrefix + kRelease) is not None and
+            getattr(makeOTFParams, kFileOptPrefix + kUseSuppliedCFF)
+            is not None):
         setattr(makeOTFParams, kFileOptPrefix + kDoSubr, None)
 
 

diff --git a/tests/runner.py b/tests/runner.py
@@ -44,6 +44,7 @@
 
 last_command = ["blah"]
 
+
 def _write_file(file_path, data):
     with open(file_path, "wb") as f:
         f.write(data)