Bug 1364552 - Deleted unused RGB24Copy function, and corresponding macros and tests. r?decoder draft
authorLorena Diaconescu <lorena9921@hotmail.com>
Thu, 07 Sep 2017 11:16:45 -0400
changeset 660795 60cbc99311af041c99eca270b6e3c1596a0f4b3e
parent 660274 7e4e0caeb049ff596f3710632e30f18be45dc0ed
child 730365 5fb3593b70f02da276457c10f3b4c212439e9fc4
push id78539
push userbmo:lorena9921@hotmail.com
push dateThu, 07 Sep 2017 15:24:28 +0000
reviewersdecoder
bugs1364552
milestone57.0a1
Bug 1364552 - Deleted unused RGB24Copy function, and corresponding macros and tests. r?decoder MozReview-Commit-ID: FhWnJIf61o8
dom/canvas/ImageBitmapColorUtils.cpp
dom/canvas/ImageBitmapColorUtils.h
dom/canvas/gtest/TestImageBitmapColorUtils.cpp
--- a/dom/canvas/ImageBitmapColorUtils.cpp
+++ b/dom/canvas/ImageBitmapColorUtils.cpp
@@ -410,27 +410,16 @@ BGRA32ToBGR24(const uint8_t* aSrcBuffer,
   return RGBAFamilyToRGBFamily<2, 1, 0, 2, 1, 0>(aSrcBuffer, aSrcStride,
                                                  aDstBuffer, aDstStride,
                                                  aWidth, aHeight);
 }
 
 /*
  * Among RGB family.
  */
-int
-RGB24Copy(const uint8_t* aSrcBuffer, int aSrcStride,
-          uint8_t* aDstBuffer, int aDstStride,
-          int aWidth, int aHeight)
-{
-  MOZ_ASSERT(aSrcStride == aDstStride, "RGB24Copy: aSrcStride != aDstStride");
-
-  const uint32_t length = aHeight * aDstStride;
-  memcpy(aDstBuffer, aSrcBuffer, length);
-  return 0;
-}
 
 int
 RGB24ToBGR24(const uint8_t* aSrcBuffer, int aSrcStride,
              uint8_t* aDstBuffer, int aDstStride,
              int aWidth, int aHeight)
 {
   for (int i = 0; i < aHeight; ++i) {
     const uint8_t* srcBuffer = aSrcBuffer + aSrcStride * i;
--- a/dom/canvas/ImageBitmapColorUtils.h
+++ b/dom/canvas/ImageBitmapColorUtils.h
@@ -56,25 +56,16 @@ int
 BGRA32ToBGR24(const uint8_t* aSrcBuffer, int aSrcStride,
               uint8_t* aDstBuffer, int aDstStride,
               int aWidth, int aHeight);
 
 /*
  * Among RGB family.
  */
 int
-RGB24Copy(const uint8_t* aSrcBuffer, int aSrcStride,
-          uint8_t* aDstBuffer, int aDstStride,
-          int aWidth, int aHeight);
-
-#define BGR24Copy RGB24Copy
-#define RGB24ToRGB24 RGB24Copy
-#define BGR24ToBGR24 BGR24Copy
-
-int
 RGB24ToBGR24(const uint8_t* aSrcBuffer, int aSrcStride,
              uint8_t* aDstBuffer, int aDstStride,
              int aWidth, int aHeight);
 
 #define BGR24ToRGB24 RGB24ToBGR24
 
 /*
  * YUV family -> RGB family.
--- a/dom/canvas/gtest/TestImageBitmapColorUtils.cpp
+++ b/dom/canvas/gtest/TestImageBitmapColorUtils.cpp
@@ -489,42 +489,16 @@ public:
     mData[i + 3] = 100.0f;      mData[i + 4] = 0.0f;         mData[i + 5] = 0.0f;
     mData[i + 6] = 53.585014f;  mData[i + 7] = 0.0f;         mData[i + 8] = 0.0f;
   }
 };
 
 /*
  * From RGB24.
  */
-
-TEST(ImageBitmapColorUtils, RGB24ToRGB24_)
-{
-  const RGB24Data srcData;
-  const RGB24Data dstData;
-
-  SimpleImage<uint8_t> result_(srcData.mWidth, srcData.mHeight, dstData.mChannelCount);
-
-  int rv = RGB24ToRGB24(srcData.mData, srcData.mStride,
-                        result_.mData, result_.mStride,
-                        result_.mWidth, result_.mHeight);
-
-  ASSERT_TRUE(rv == 0);
-
-  for (int i = 0; i < srcData.mHeight; ++i) {
-    for (int j = 0; j < srcData.mWidth; ++j) {
-      EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 0],
-                dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 0]);
-      EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 1],
-                dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 1]);
-      EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 2],
-                dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 2]);
-    }
-  }
-}
-
 TEST(ImageBitmapColorUtils, RGB24ToBGR24_)
 {
   const RGB24Data srcData;
   const BGR24Data dstData;
   SimpleImage<uint8_t> result_(srcData.mWidth, srcData.mHeight, dstData.mChannelCount);
 
   int rv = RGB24ToBGR24(srcData.mData, srcData.mStride,
                         result_.mData, result_.mStride,
@@ -892,39 +866,16 @@ TEST(ImageBitmapColorUtils, BGR24ToRGB24
       EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 1],
                 dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 1]);
       EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 2],
                 dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 2]);
     }
   }
 }
 
-TEST(ImageBitmapColorUtils, BGR24ToBGR24_)
-{
-  const BGR24Data srcData;
-  const BGR24Data dstData;
-  SimpleImage<uint8_t> result_(srcData.mWidth, srcData.mHeight, dstData.mChannelCount);
-
-  int rv = BGR24ToBGR24(srcData.mData, srcData.mStride,
-                        result_.mData, result_.mStride,
-                        result_.mWidth, result_.mHeight);
-  ASSERT_TRUE(rv == 0);
-
-  for (int i = 0; i < srcData.mHeight; ++i) {
-    for (int j = 0; j < srcData.mWidth; ++j) {
-      EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 0],
-                dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 0]);
-      EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 1],
-                dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 1]);
-      EXPECT_EQ(result_.mData[i * result_.mStride + j * result_.mChannelCount + 2],
-                dstData.mData[i * dstData.mStride + j * dstData.mChannelCount + 2]);
-    }
-  }
-}
-
 TEST(ImageBitmapColorUtils, BGR24ToRGBA32)
 {
   const BGR24Data srcData;
   const RGBA32Data dstData;
   SimpleImage<uint8_t> result_(srcData.mWidth, srcData.mHeight, dstData.mChannelCount);
 
   int rv = BGR24ToRGBA32(srcData.mData, srcData.mStride,
                          result_.mData, result_.mStride,