SkBitmap move

gm/all_bitmap_configs.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SkSurface.h"
 #include "Resources.h"
 #include "gm.h"
 
 #include "SkMath.h"
 #include "SkColorPriv.h"
 
 static SkBitmap copy_bitmap(const SkBitmap& src, SkColorType colorType) {
     SkBitmap copy;
     src.copyTo(&copy, colorType);
     copy.setImmutable();
-    return copy;
+    return skstd::move(copy);
 }
 
 #define SCALE 128
 
 // Make either A8 or gray8 bitmap.
 static SkBitmap make_bitmap(SkColorType ct) {
     SkBitmap bm;
     switch (ct) {
         case kAlpha_8_SkColorType:
             bm.allocPixels(SkImageInfo::MakeA8(SCALE, SCALE));
             break;
         case kGray_8_SkColorType:
             bm.allocPixels(
                     SkImageInfo::Make(SCALE, SCALE, ct, kOpaque_SkAlphaType));
             break;
         default:
             SkASSERT(false);
             return bm;
     }
     SkAutoLockPixels autoLockPixels(bm);
     uint8_t spectrum[256];
     for (int y = 0; y < 256; ++y) {
         spectrum[y] = y;
     }
     for (int y = 0; y < 128; ++y) {
         // Shift over one byte each scanline.
         memcpy(bm.getAddr8(0, y), &spectrum[y], 128);
     }
     bm.setImmutable();
-    return bm;
+    return skstd::move(bm);
 }
 
 static void draw_center_letter(char c,
                                SkPaint* p,
                                SkColor color,
                                SkScalar x,
                                SkScalar y,
                                SkCanvas* canvas) {
     SkRect bounds;
     p->setColor(color);
@@ skipping 69 matching lines @@
     bm.allocPixels(info, nullptr, ctable);
     SkAutoLockPixels autoLockPixels1(n32bitmap);
     SkAutoLockPixels autoLockPixels2(bm);
     for (int y = 0; y < SCALE; ++y) {
         for (int x = 0; x < SCALE; ++x) {
             SkPMColor c = *n32bitmap.getAddr32(x, y);
             int idx = find(pmColors, SK_ARRAY_COUNT(pmColors), c);
             *bm.getAddr8(x, y) = SkClampMax(idx, SK_ARRAY_COUNT(pmColors) - 1);
         }
     }
-    return bm;
+    return skstd::move(bm);
 }
 
 static void draw(SkCanvas* canvas,
                  const SkPaint& p,
                  const SkBitmap& src,
                  SkColorType colorType,
                  const char text[]) {
     SkASSERT(src.colorType() == colorType);
     canvas->drawBitmap(src, 0.0f, 0.0f);
     canvas->drawText(text, strlen(text), 0.0f, 12.0f, p);
@@ skipping 58 matching lines @@
     SkASSERT(notN32bitmap.colorType() == ct);
     return SkImage::NewFromBitmap(notN32bitmap);
 }
 
 DEF_SIMPLE_GM(not_native32_bitmap_config, canvas, SCALE, SCALE) {
     SkAutoTUnref<SkImage> notN32image(make_not_native32_color_wheel());
     SkASSERT(notN32image);
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8);
     canvas->drawImage(notN32image, 0.0f, 0.0f);
 }