Add type hints, update libjpeg, allow returning bytearray (pydicom#58)

.github/workflows/release-wheels.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Store artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: sdist
         path: ./dist
 
   build-wheels:
@@ -184,7 +184,7 @@ jobs:
     - name: Store artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: wheels
+        name: wheel-${{ matrix.python }}-${{ matrix.platform_id }}
         path: ./dist
 
   test-package:
@@ -206,8 +206,8 @@ jobs:
     - name: Download the wheels
       uses: actions/download-artifact@v4
       with:
-        name: wheels
         path: dist/
+        merge-multiple: true
 
     - name: Install from package wheels and test
       # If testing wheel builds might need --pre to install dev version

.gitignore

@@ -14,7 +14,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -56,7 +55,7 @@ coverage.xml
 *.pot
 
 # Django stuff:
-*.log
+#*.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libjpeg/src/libjpeg"]
-	path = libjpeg/src/libjpeg
+	path = lib/libjpeg
 	url = https://github.com/thorfdbg/libjpeg.git

build.py

@@ -9,8 +9,9 @@
 
 
 PACKAGE_DIR = Path(__file__).parent / "libjpeg"
-LIBJPEG_SRC = PACKAGE_DIR / 'src' / 'libjpeg'
-INTERFACE_SRC = PACKAGE_DIR / 'src' / 'interface'
+LIB_DIR = Path(__file__).parent / "lib"
+LIBJPEG_SRC = LIB_DIR / 'libjpeg'
+INTERFACE_SRC = LIB_DIR / 'interface'
 
 
 def build(setup_kwargs: Any) -> Any:

libjpeg/src/interface/decode.cpp → lib/interface/decode.cpp

@@ -18,8 +18,13 @@
 #include "../libjpeg/interface/jpeg.hpp"
 
 
-std::string Decode(char *inArray, char *outArray, int inLength, int outLength, int colourTransform)
-{
+std::string Decode(
+    char *inArray,
+    char *outArray,
+    int inLength,
+    int outLength,
+    int colourTransform
+) {
     /*
 
     Parameters
@@ -254,8 +259,11 @@ std::string Decode(char *inArray, char *outArray, int inLength, int outLength, i
 }
 
 
-std::string GetJPEGParameters(char *inArray, int inLength, struct JPEGParameters *param)
-{
+std::string GetJPEGParameters(
+    char *inArray,
+    int inLength,
+    struct JPEGParameters *param
+) {
     /*
 
     Parameters

libjpeg/src/interface/decode.hpp → lib/interface/decode.hpp

@@ -18,7 +18,9 @@
 
     // Return the parameters of the encoded JPEG file in `inArray`
     extern std::string GetJPEGParameters(
-        char *inArray, int inLength, struct JPEGParameters *param
+        char *inArray,
+        int inLength,
+        struct JPEGParameters *param
     );
 
     struct StreamData {

libjpeg/src/interface/streamhook.cpp → lib/interface/streamhook.cpp

@@ -51,16 +51,16 @@ JPG_LONG IStreamHook(struct JPG_Hook *hook, struct JPG_TagItem *tags)
         }
         case JPGFLAG_ACTION_WRITE:
         {
-            UBYTE *buffer = (UBYTE *)tags->GetTagPtr(JPGTAG_FIO_BUFFER);
-            ULONG  size   = (ULONG  )tags->GetTagData(JPGTAG_FIO_SIZE);
+            // UBYTE *buffer = (UBYTE *)tags->GetTagPtr(JPGTAG_FIO_BUFFER);
+            // ULONG  size   = (ULONG  )tags->GetTagData(JPGTAG_FIO_SIZE);
 
             // We want to raise an error so writing can be implemented
             return -1;
         }
         case JPGFLAG_ACTION_SEEK:
         {
             LONG mode   = tags->GetTagData(JPGTAG_FIO_SEEKMODE);
-            LONG offset = tags->GetTagData(JPGTAG_FIO_OFFSET);
+            // LONG offset = tags->GetTagData(JPGTAG_FIO_OFFSET);
 
             // We want to raise an error here seek can be implemented
             switch(mode) {