Merge pull request #2 from digarok/fix-path-casing

Fix path casing

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
       if: matrix.os == 'windows-latest'
       uses: actions/upload-artifact@v2
       with:
-        name: binary
+        name: ${{ format('binary-{0}', matrix.os) }}
         path: b2d.exe
 
   create-release:
@@ -97,11 +97,11 @@ jobs:
     - name: Package NIX
       if: matrix.os != 'windows-latest'
       run: |
-        zip --junk-paths b2d.zip binary/b2d README.md
+        zip --junk-paths b2d.zip ${{ format('binary-{0}/b2d', matrix.os) }} README.md
     - name: Package WIN
       if: matrix.os == 'windows-latest'
       run: |
-        7z.exe a b2d.zip ./binary/b2d.exe README.md
+        7z.exe a b2d.zip ${{ format('./binary-{0}/b2d.exe', matrix.os) }} README.md
     - name: Upload Release Asset
       id: upload-release-asset 
       uses: actions/upload-release-asset@v1.0.1

src/b2d.c

@@ -2027,7 +2027,6 @@ int savelofragment() {
     /* save single lo-res and double lo-res */
     /* save raster images of 48 or 40 scanlines
        (full graphics or mixed text and graphics) */
-
     if (lores == 1) {
       if (appletop == 1) {
         fl = 802;
@@ -3511,13 +3510,13 @@ void FloydSteinberg(int y, int width) {
                     * 2 1
                   1 2 1
                     1          (1/8)
-       
+
                   Serpentine
-       
+
                 1 2 *
                   1 2 1
                     1
-       
+
                   */
 
           /* if error summing is turned-on add the accumulated rounding error
@@ -6741,10 +6740,21 @@ int main(int argc, char **argv) {
   sprintf(usertextfile, "%s.txt", fname);
 
   /* upper case basename for Apple II Output */
-  for (idx = 0; fname[idx] != (uchar)0; idx++) {
-    ch = toupper(fname[idx]);
-    fname[idx] = ch;
+  // get filename part so we only upper case that
+  char *filename =  strrchr(fname, '/');
+  // no slash found so use full string
+  if (!filename) {
+    filename = fname;
+  } else {
+    filename++;  // advance pointer past '/'
   }
+  // now upper part/full string
+  for (idx = 0; filename[idx] != (uchar)0; idx++) {
+    ch = toupper(filename[idx]);
+    filename[idx] = ch;
+  }
+
+
   strcpy(hgrwork, fname);
 
   if (basename == 1) {

tests/test.sh

@@ -4,7 +4,9 @@ echo " --- Super High-Tech Test Suite v0.1234zaxxon ---"
 #####################################
 # LORES
 echo "LORES TEST START"
+echo " - RUN: '$B2D black-40x48.bmp L N'"
 $B2D black-40x48.bmp L N
+echo " - RUN: '$B2D white-40x48.bmp L N'"
 $B2D white-40x48.bmp L N
 
 diff BLACK-40X48.SLO BLACK.LORES