Switch to pixmap in API.

src/core/SkLinearBitmapPipeline.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkLinearBitmapPipeline.h"
 
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include "SkColor.h"
+#include "SkSize.h"
+
 struct X {
     explicit X(SkScalar val) : fVal{val} { }
     explicit X(SkPoint pt) : fVal{pt.fX} { }
     explicit X(SkSize s) : fVal{s.fWidth} { }
     explicit X(SkISize s) : fVal(s.fWidth) { }
     operator float () const {return fVal;}
 private:
     float fVal;
 };
 
@@ skipping 163 matching lines @@
     return matrixProc->get();
 }
 
 template <typename Next = BilerpProcessorInterface>
 class ExpandBilerp final : public PointProcessorInterface {
 public:
     ExpandBilerp(Next* next) : fNext{next} { }
 
     void pointListFew(int n, Sk4fArg xs, Sk4fArg ys) override {
         SkASSERT(0 < n && n < 4);
-        //                   px00  px10  px01  px11
-        const Sk4f kXOffsets{0.0f, 1.0f, 0.0f, 1.0f},
-                   kYOffsets{0.0f, 0.0f, 1.0f, 1.0f};
+        //                    px00   px10   px01  px11
+        const Sk4f kXOffsets{-0.5f,  0.5f, -0.5f, 0.5f},
+                   kYOffsets{-0.5f, -0.5f,  0.5f, 0.5f};
         if (n >= 1) fNext->bilerpList(Sk4f{xs[0]} + kXOffsets, Sk4f{ys[0]} + kYOffsets);
         if (n >= 2) fNext->bilerpList(Sk4f{xs[1]} + kXOffsets, Sk4f{ys[1]} + kYOffsets);
         if (n >= 3) fNext->bilerpList(Sk4f{xs[2]} + kXOffsets, Sk4f{ys[2]} + kYOffsets);
     }
 
     void pointList4(Sk4fArg xs, Sk4fArg ys) override {
-        //                   px00  px10  px01  px11
-        const Sk4f kXOffsets{0.0f, 1.0f, 0.0f, 1.0f},
-                   kYOffsets{0.0f, 0.0f, 1.0f, 1.0f};
+        //                    px00   px10   px01  px11
+        const Sk4f kXOffsets{-0.5f,  0.5f, -0.5f, 0.5f},
+                   kYOffsets{-0.5f, -0.5f,  0.5f, 0.5f};
         fNext->bilerpList(Sk4f{xs[0]} + kXOffsets, Sk4f{ys[0]} + kYOffsets);
         fNext->bilerpList(Sk4f{xs[1]} + kXOffsets, Sk4f{ys[1]} + kYOffsets);
         fNext->bilerpList(Sk4f{xs[2]} + kXOffsets, Sk4f{ys[2]} + kYOffsets);
         fNext->bilerpList(Sk4f{xs[3]} + kXOffsets, Sk4f{ys[3]} + kYOffsets);
     }
 
 private:
     Next* const fNext;
 };
 
@@ skipping 233 matching lines @@
         fNext->placePixel(pixel);
     }
 
 private:
     PixelPlacerInterface* const fNext;
     SourceStrategy fStrategy;
 };
 
 static BilerpProcessorInterface* choose_pixel_sampler(
     PixelPlacerInterface* next,
-    const SkImageInfo& imageInfo,
-    const void* imageData,
+    const SkPixmap& srcPixmap,
     SkLinearBitmapPipeline::SampleStage* sampleStage) {
+    const SkImageInfo& imageInfo = srcPixmap.info();
     switch (imageInfo.colorType()) {
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
             if (kN32_SkColorType == imageInfo.colorType()) {
                 if (imageInfo.profileType() == kSRGB_SkColorProfileType) {
                     sampleStage->Initialize<Sampler<Passthrough8888<kSRGB_SkColorProfileType>>>(
-                        next, imageInfo.width(),
-                        (uint32_t*)imageData);
+                        next, static_cast<int>(srcPixmap.rowBytes() / 4),
+                        srcPixmap.addr32());
                 } else {
                     sampleStage->Initialize<Sampler<Passthrough8888<kLinear_SkColorProfileType>>>(
-                        next, imageInfo.width(),
-                        (uint32_t*)imageData);
+                        next, static_cast<int>(srcPixmap.rowBytes() / 4),
+                        srcPixmap.addr32());
                 }
             } else {
                 SkFAIL("Not implemented. No 8888 Swizzle");
             }
             break;
         default:
             SkFAIL("Not implemented. Unsupported src");
             break;
     }
     return sampleStage->get();
@@ skipping 45 matching lines @@
         // kOpaque_SkAlphaType is treated the same as kPremul_SkAlphaType
         placerStage->Initialize<PlaceFPPixel<kPremul_SkAlphaType>>();
     }
     return placerStage->get();
 }
 
 SkLinearBitmapPipeline::SkLinearBitmapPipeline(
     const SkMatrix& inverse,
     SkFilterQuality filterQuality,
     SkShader::TileMode xTile, SkShader::TileMode yTile,
-    const SkImageInfo& srcImageInfo,
-    const void* srcImageData) {
-    SkSize size;
-    size = srcImageInfo.dimensions();
+    const SkPixmap& srcPixmap) {
+    SkSize size = SkSize::Make(srcPixmap.width(), srcPixmap.height());
+    const SkImageInfo& srcImageInfo = srcPixmap.info();
 
     // As the stages are built, the chooser function may skip a stage. For example, with the
     // identity matrix, the matrix stage is skipped, and the tilerStage is the first stage.
     auto placementStage = choose_pixel_placer(srcImageInfo.alphaType(), &fPixelStage);
-    auto samplerStage   = choose_pixel_sampler(placementStage, srcImageInfo,
-                                               srcImageData, &fSampleStage);
+    auto samplerStage   = choose_pixel_sampler(placementStage, srcPixmap, &fSampleStage);
     auto tilerStage     = choose_tiler(samplerStage, size, xTile, yTile, &fTileXOrBothStage,
                                        &fTileYStage);
     auto filterStage    = choose_filter(tilerStage, filterQuality, &fFilterStage);
     fFirstStage         = choose_matrix(filterStage, inverse, &fMatrixStage);
 }
 
 void SkLinearBitmapPipeline::shadeSpan4f(int x, int y, SkPM4f* dst, int count) {
     fPixelStage->setDestination(dst);
 
     Sk4f Xs = Sk4f(x) + Sk4f{0.5f, 1.5f, 2.5f, 3.5f};
     Sk4f Ys(y);
     Sk4f fours{4.0f};
 
     while (count >= 4) {
         fFirstStage->pointList4(Xs, Ys);
         Xs = Xs + fours;
         count -= 4;
     }
     if (count > 0) {
         fFirstStage->pointListFew(count, Xs, Ys);
     }
 }