Merge branch 'kwIconToQImage'

* kwIconToQImage:
  Use proper CTK logo to test ctk::kwIconToQImage

Libs/Widgets/Testing/Cpp/ctkLogo-small-transparent.h

@@ -0,0 +1,76 @@
+/* 
+ * Resource generated for file:
+ *    ctkLogo-small-transparent.png (zlib, base64) (image file)
+ */
+static const unsigned int  image_ctkLogo_small_transparent_width          = 55;
+static const unsigned int  image_ctkLogo_small_transparent_height         = 55;
+static const unsigned int  image_ctkLogo_small_transparent_pixel_size     = 4;
+static const unsigned long image_ctkLogo_small_transparent_length         = 4444;
+static const unsigned long image_ctkLogo_small_transparent_decoded_length = 12100;
+
+static const unsigned char image_ctkLogo_small_transparent[] = 
+  "eNrtmudvVGcWxvcPiNJ7IQnpvVelKImUaFcKSlahOYWSxHRM74TeQjHVYMAVXGfssbHBNh"
+  "gYF7oBY9NsbGxTTEtQiiLlS3T2+b3j6/WusoqlMNFa4sPRvZ655Tzvec5zznnHZvY3u2pX"
+  "7ap1eDt9+rRVVlba/gMHbN++fbZ7927bsWOHlZaVWkfH1tDQYPv377e9e/c6XOXlwlVaal"
+  "u2bLGLFy9e7sjYTp48aRUVFbZ3zx7btWuXlZWVWUlJiW3evNkuX75c0dGxeVzcuXOnsJVb"
+  "SbDEioqKOjy2+vqTrXzcUV7u+Lh9+3YrLCxsN7aqqqq/JDd/+eWXuadOnbKmpsZ2va+6ur"
+  "o1ZuUOW4lt27bNisTJ02fO/OEz8jfm2+o1ayw+Pj6s+H799dfIpqYma2xsNDSirq7uf77v"
+  "/PnzdvDgQRczcMHBYEnQgsGgixn5tmnTJgP7b7/91vn3nrFx40ZbI1yrV6+2mJUxYcP300"
+  "8/ZbbFVV9fbydOnLDjx49bW+zwjNiCmzyDgwUFBe763dISsICbOsDnmZmZ7js080ybOII/"
+  "QVji4uIsNjbWYmJibNmyZbZkyZIrjg9cYGqQNni4amtrHbajR4/akSNHjLzA9+bmZjt37p"
+  "zTQ2IHFvSRmG3dWuw4eunSJTt06JClpaW5a7kvIyPDMtLT3TExMdHFibitWrXKVqxYYUuX"
+  "LrXoRdHu/ErrHUY8wFVTW+NwHTt2zPlFjDAwUK8vXLhg3333HfGws2fPWmlJKM+2bt1qGz"
+  "ZscN9xzffff++wsV6pqamWkJDgYsUxXkf4uHLlSlu+fLmL2aLoRTZu/Dh3/ZXEV9sSq5qa"
+  "GoeJeO1pqVv4h6/EiCN/c+4ZNa64eKvl5ua669t+5xnxhpeHDx92XCVm8HFFzArHx8WLF9"
+  "uUKVMcz8ORd3DPwwW36Kc4J3bwFkxt7aLicunnn+2M8FaLn4fE2ws//mgXf/ihFY93LfGl"
+  "XwFXYUGh4zT8w8A2bdo0ty7h1EvWlVwhZmA9oF6xomK/w4qvbv3Fy+PyI3/wYIvr/IDF33"
+  "CDJd10k7O4O++yjH9+bHuys61RXGgWLu5hjZKTkx0fiZmnNeCaOXOm09dw1zg0A1yeBuwX"
+  "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"
+  "PyjzXbMKde/X++q3bVrlpHsH8BW3wRDw==";
+

Libs/Widgets/Testing/Cpp/ctkWidgetsUtilsTest1.cpp

@@ -25,63 +25,20 @@
 
 // CTK includes
 #include "ctkWidgetsUtils.h"
+#include "ctkLogo-small-transparent.h"
 
 // STD includes
 #include <cstdlib>
 #include <iostream>
 
-/* 
- * Resource generated for file:
- *    NAMICLogo.png (zlib, base64) (image file)
- */
-static const unsigned int  image_NAMICLogo_width          = 33;
-static const unsigned int  image_NAMICLogo_height         = 40;
-static const unsigned int  image_NAMICLogo_pixel_size     = 3;
-static const unsigned long image_NAMICLogo_length         = 2196;
-static const unsigned long image_NAMICLogo_decoded_length = 3960;
-
-static const unsigned char image_NAMICLogo[] = 
-  "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"
-  "asevkBFcYnYmX6577yP5n9Qys=";
-
 //-----------------------------------------------------------------------------
 int ctkWidgetsUtilsTest1(int argc, char * argv [] )
 {
   QApplication app(argc, argv);
 
-  QImage image = ctk::kwIconToQImage(image_NAMICLogo,
-    image_NAMICLogo_width, image_NAMICLogo_height,
-    image_NAMICLogo_pixel_size, image_NAMICLogo_length);
+  QImage image = ctk::kwIconToQImage(image_ctkLogo_small_transparent,
+    image_ctkLogo_small_transparent_width, image_ctkLogo_small_transparent_height,
+    image_ctkLogo_small_transparent_pixel_size, image_ctkLogo_small_transparent_length);
 
   QLabel label;
   label.setPixmap(QPixmap::fromImage(image));

Libs/Widgets/ctkWidgetsUtils.cpp

@@ -57,10 +57,10 @@ QImage ctk::kwIconToQImage(const unsigned char *data, int width, int height, int
       static_cast<unsigned char>(imageData[0]) == 0x78 &&
       static_cast<unsigned char>(imageData[1]) == 0xDA)
     {
-    imageData.prepend((char)((expectedLength >> 0) & 0xFF));
-    imageData.prepend((char)((expectedLength >> 8) & 0xFF));
-    imageData.prepend((char)((expectedLength >> 16) & 0xFF));
-    imageData.prepend((char)((expectedLength >> 24) & 0xFF));
+    imageData.prepend(static_cast<char>((expectedLength >> 0) & 0xFF));
+    imageData.prepend(static_cast<char>((expectedLength >> 8) & 0xFF));
+    imageData.prepend(static_cast<char>((expectedLength >> 16) & 0xFF));
+    imageData.prepend(static_cast<char>((expectedLength >> 24) & 0xFF));
     imageData = qUncompress(imageData);
     }
   QImage image(reinterpret_cast<unsigned char*>(imageData.data()),