make the ScanlineFormat values more explicit

instead of cleverly deciding that one format is actually another
format, depending on the current state of the supportsBitmap32()
call, just have explicit values that say what the actual format is.

This patch should have no functional affect, but will make
upcoming patches simpler.

Change-Id: I07f127a3e36800aa4cee034261c2e1216d8e8da1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180089
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

1 files changed, 41 insertions, 32 deletions

diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx b/vcl/source/bitmap/BitmapReadAccess.cxx
index 9a7c8082ed2d..7688e0db8f64 100644
--- a/vcl/source/bitmap/BitmapReadAccess.cxx
+++ b/vcl/source/bitmap/BitmapReadAccess.cxx
@@ -70,25 +70,29 @@ FncGetPixel BitmapReadAccess::GetPixelFunction(ScanlineFormat nFormat)
         case ScanlineFormat::N24BitTcRgb:
             return GetPixelForN24BitTcRgb;
         case ScanlineFormat::N32BitTcAbgr:
-            if (Bitmap32IsPreMultipled())
-                return GetPixelForN32BitTcAbgr;
-            else
-                return GetPixelForN32BitTcXbgr;
+            assert(Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcAbgr;
+        case ScanlineFormat::N32BitTcXbgr:
+            assert(!Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcXbgr;
         case ScanlineFormat::N32BitTcArgb:
-            if (Bitmap32IsPreMultipled())
-                return GetPixelForN32BitTcArgb;
-            else
-                return GetPixelForN32BitTcXrgb;
+            assert(Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcArgb;
+        case ScanlineFormat::N32BitTcXrgb:
+            assert(!Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcXrgb;
         case ScanlineFormat::N32BitTcBgra:
-            if (Bitmap32IsPreMultipled())
-                return GetPixelForN32BitTcBgra;
-            else
-                return GetPixelForN32BitTcBgrx;
+            assert(Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcBgra;
+        case ScanlineFormat::N32BitTcBgrx:
+            assert(!Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcBgrx;
         case ScanlineFormat::N32BitTcRgba:
-            if (Bitmap32IsPreMultipled())
-                return GetPixelForN32BitTcRgba;
-            else
-                return GetPixelForN32BitTcRgbx;
+            assert(Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcRgba;
+        case ScanlineFormat::N32BitTcRgbx:
+            assert(!Bitmap32IsPreMultipled());
+            return GetPixelForN32BitTcRgbx;
         case ScanlineFormat::N32BitTcMask:
             return GetPixelForN32BitTcMask;
 
@@ -110,29 +114,34 @@ FncSetPixel BitmapReadAccess::SetPixelFunction(ScanlineFormat nFormat)
         case ScanlineFormat::N24BitTcRgb:
             return SetPixelForN24BitTcRgb;
         case ScanlineFormat::N32BitTcAbgr:
-            if (Bitmap32IsPreMultipled())
-                return SetPixelForN32BitTcAbgr;
-            else
-                return SetPixelForN32BitTcXbgr;
+            assert(Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcAbgr;
+        case ScanlineFormat::N32BitTcXbgr:
+            assert(!Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcXbgr;
         case ScanlineFormat::N32BitTcArgb:
-            if (Bitmap32IsPreMultipled())
-                return SetPixelForN32BitTcArgb;
-            else
-                return SetPixelForN32BitTcXrgb;
+            assert(Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcArgb;
+        case ScanlineFormat::N32BitTcXrgb:
+            assert(!Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcXrgb;
         case ScanlineFormat::N32BitTcBgra:
-            if (Bitmap32IsPreMultipled())
-                return SetPixelForN32BitTcBgra;
-            else
-                return SetPixelForN32BitTcBgrx;
+            assert(Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcBgra;
+        case ScanlineFormat::N32BitTcBgrx:
+            assert(!Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcBgrx;
         case ScanlineFormat::N32BitTcRgba:
-            if (Bitmap32IsPreMultipled())
-                return SetPixelForN32BitTcRgba;
-            else
-                return SetPixelForN32BitTcRgbx;
+            assert(Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcRgba;
+        case ScanlineFormat::N32BitTcRgbx:
+            assert(!Bitmap32IsPreMultipled());
+            return SetPixelForN32BitTcRgbx;
         case ScanlineFormat::N32BitTcMask:
             return SetPixelForN32BitTcMask;
 
         default:
+            assert(false);
             return nullptr;
     }
 }