aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--samplecode/OverView.cpp4
-rw-r--r--samplecode/SampleAARectModes.cpp12
-rw-r--r--samplecode/SampleAll.cpp4
-rw-r--r--samplecode/SampleApp.cpp20
-rw-r--r--samplecode/SampleArc.cpp2
-rw-r--r--samplecode/SampleBlur.cpp3
-rw-r--r--samplecode/SampleCircle.cpp3
-rw-r--r--samplecode/SampleClip.cpp4
-rw-r--r--samplecode/SampleColorFilter.cpp4
-rw-r--r--samplecode/SampleGradients.cpp4
-rw-r--r--samplecode/SampleHairModes.cpp12
-rw-r--r--samplecode/SampleLineClipper.cpp4
-rw-r--r--samplecode/SampleOverflow.cpp4
-rw-r--r--samplecode/SamplePatch.cpp11
-rw-r--r--samplecode/SamplePathClip.cpp2
-rw-r--r--samplecode/SampleRegion.cpp10
-rw-r--r--samplecode/SampleShaderText.cpp2
-rw-r--r--samplecode/SampleSlides.cpp6
-rw-r--r--samplecode/SampleStrokeText.cpp4
-rw-r--r--samplecode/SampleTextAlpha.cpp7
-rw-r--r--samplecode/SampleXfermodesBlur.cpp5
-rw-r--r--samplecode/TransitionView.cpp7
22 files changed, 70 insertions, 64 deletions
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp
index d0c387b12e..9858608241 100644
--- a/samplecode/OverView.cpp
+++ b/samplecode/OverView.cpp
@@ -69,10 +69,14 @@ private:
typedef SkView INHERITED;
};
+// FIXME: this should be in a header
+SkView* create_overview(int count, const SkViewFactory* factories[]);
SkView* create_overview(int count, const SkViewFactory* factories[]) {
return SkNEW_ARGS(OverView, (count, factories));
}
+// FIXME: this should be in a header
+bool is_overview(SkView* view);
bool is_overview(SkView* view) {
SkEvent isOverview(gIsOverview);
return view->doQuery(&isOverview);
diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp
index 7b9e7d5eb3..a1004a3832 100644
--- a/samplecode/SampleAARectModes.cpp
+++ b/samplecode/SampleAARectModes.cpp
@@ -12,18 +12,6 @@
#include "SkColorPriv.h"
#include "SkShader.h"
-static SkCanvas* create_canvas(int w, int h) {
- SkBitmap bm;
- bm.setConfig(SkBitmap::kARGB_8888_Config, w, h);
- bm.allocPixels();
- bm.eraseColor(0);
- return new SkCanvas(bm);
-}
-
-static const SkBitmap& extract_bitmap(SkCanvas* canvas) {
- return canvas->getDevice()->accessBitmap(false);
-}
-
static const struct {
SkXfermode::Mode fMode;
const char* fLabel;
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 4ab3b0e453..201dfe7a2d 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -323,8 +323,8 @@ protected:
path.addCircle(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(20),
SkPath::kCCW_Direction);
for (int index = 0; index < 10; index++) {
- SkScalar x = SkFloatToScalar(cos(index / 10.0f * 2 * 3.1415925358f));
- SkScalar y = SkFloatToScalar(sin(index / 10.0f * 2 * 3.1415925358f));
+ SkScalar x = SkFloatToScalar((float) cos(index / 10.0f * 2 * 3.1415925358f));
+ SkScalar y = SkFloatToScalar((float) sin(index / 10.0f * 2 * 3.1415925358f));
x *= index & 1 ? 7 : 14;
y *= index & 1 ? 7 : 14;
x += SkIntToScalar(20);
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index fd19e89a5c..5d3296deee 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -406,7 +406,7 @@ private:
// registers GMs as Samples
// This can't be performed during static initialization because it could be
// run before GMRegistry has been fully built.
-void SkGMRegistyToSampleRegistry() {
+static void SkGMRegistyToSampleRegistry() {
static bool gOnce;
static AutoUnrefArray fRegisters;
@@ -599,6 +599,8 @@ GrContext* SampleCode::GetGr() {
// some GMs rely on having a skiagm::GetGr function defined
namespace skiagm {
+ // FIXME: this should be moved into a header
+ GrContext* GetGr();
GrContext* GetGr() { return SampleCode::GetGr(); }
}
@@ -1173,6 +1175,7 @@ void SampleWindow::onDraw(SkCanvas* canvas) {
#include "SkColorPriv.h"
+#if 0 // UNUSED
static void reverseRedAndBlue(const SkBitmap& bm) {
SkASSERT(bm.config() == SkBitmap::kARGB_8888_Config);
uint8_t* p = (uint8_t*)bm.getPixels();
@@ -1188,6 +1191,7 @@ static void reverseRedAndBlue(const SkBitmap& bm) {
p += 4;
}
}
+#endif
void SampleWindow::saveToPdf()
{
@@ -1631,6 +1635,7 @@ bool SampleWindow::onQuery(SkEvent* query) {
return this->INHERITED::onQuery(query);
}
+#if 0 // UNUSED
static void cleanup_for_filename(SkString* name) {
char* str = name->writable_str();
for (size_t i = 0; i < name->size(); i++) {
@@ -1642,6 +1647,7 @@ static void cleanup_for_filename(SkString* name) {
}
}
}
+#endif
bool SampleWindow::onHandleChar(SkUnichar uni) {
{
@@ -2329,11 +2335,17 @@ static void test() {
}
}
+// FIXME: this should be in a header
+SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv);
SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
-// test();
+ if (false) { // avoid bit rot, suppress warning
+ test();
+ }
return new SampleWindow(hwnd, argc, argv, NULL);
}
+// FIXME: this should be in a header
+void get_preferred_size(int* x, int* y, int* width, int* height);
void get_preferred_size(int* x, int* y, int* width, int* height) {
*x = 10;
*y = 50;
@@ -2341,6 +2353,8 @@ void get_preferred_size(int* x, int* y, int* width, int* height) {
*height = 480;
}
+// FIXME: this should be in a header
+void application_init();
void application_init() {
// setenv("ANDROID_ROOT", "../../../data", 0);
#ifdef SK_BUILD_FOR_MAC
@@ -2350,6 +2364,8 @@ void application_init() {
SkEvent::Init();
}
+// FIXME: this should be in a header
+void application_term();
void application_term() {
SkEvent::Term();
SkGraphics::Term();
diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index d418a4b8f4..43660a322d 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -25,7 +25,7 @@
#include "SkParsePath.h"
static void testparse() {
SkRect r;
- r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5));
+ r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f));
SkPath p, p2;
SkString str, str2;
diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp
index aa92343a93..f49d96e32b 100644
--- a/samplecode/SampleBlur.cpp
+++ b/samplecode/SampleBlur.cpp
@@ -52,6 +52,9 @@ class BlurView : public SampleView {
SkBitmap fBM;
public:
BlurView() {
+ if (false) { // avoid bit rot, suppress warning
+ fBM = make_bitmap();
+ }
}
protected:
diff --git a/samplecode/SampleCircle.cpp b/samplecode/SampleCircle.cpp
index c3f986dfa4..def90ad100 100644
--- a/samplecode/SampleCircle.cpp
+++ b/samplecode/SampleCircle.cpp
@@ -57,6 +57,9 @@ protected:
paint.setStrokeWidth(SkIntToScalar(width));
}
canvas->drawCircle(0, 0, SkIntToScalar(9) + fRAD, paint);
+ if (false) { // avoid bit rot, suppress warning
+ test_circlebounds(canvas);
+ }
}
void drawSix(SkCanvas* canvas, SkScalar dx, SkScalar dy) {
diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index fd3f1fd00a..6695c62539 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -31,10 +31,6 @@ static void show_text(SkCanvas* canvas, bool doAA) {
}
}
-static bool valid(int i) {
- return i < 15 && i > 7;
-}
-
static void show_fill(SkCanvas* canvas, bool doAA) {
SkRandom rand;
SkPaint paint;
diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index 52bf950427..3e1dbb1145 100644
--- a/samplecode/SampleColorFilter.cpp
+++ b/samplecode/SampleColorFilter.cpp
@@ -133,7 +133,9 @@ public:
fBitmap = createBitmap(N);
fShader = createChecker();
-// test_5bits();
+ if (false) { // avoid bit rot, suppress warning
+ test_5bits();
+ }
}
virtual ~ColorFilterView() {
diff --git a/samplecode/SampleGradients.cpp b/samplecode/SampleGradients.cpp
index 18536cf343..661c20a394 100644
--- a/samplecode/SampleGradients.cpp
+++ b/samplecode/SampleGradients.cpp
@@ -168,7 +168,9 @@ protected:
canvas->restore();
canvas->translate(0, SkIntToScalar(370));
- // test_alphagradients(canvas);
+ if (false) { // avoid bit rot, suppress warning
+ test_alphagradients(canvas);
+ }
this->inval(NULL);
}
diff --git a/samplecode/SampleHairModes.cpp b/samplecode/SampleHairModes.cpp
index cc22b17e5d..4780476699 100644
--- a/samplecode/SampleHairModes.cpp
+++ b/samplecode/SampleHairModes.cpp
@@ -12,18 +12,6 @@
#include "SkColorPriv.h"
#include "SkShader.h"
-static SkCanvas* create_canvas(int w, int h) {
- SkBitmap bm;
- bm.setConfig(SkBitmap::kARGB_8888_Config, w, h);
- bm.allocPixels();
- bm.eraseColor(0);
- return new SkCanvas(bm);
-}
-
-static const SkBitmap& extract_bitmap(SkCanvas* canvas) {
- return canvas->getDevice()->accessBitmap(false);
-}
-
static const struct {
SkXfermode::Mode fMode;
const char* fLabel;
diff --git a/samplecode/SampleLineClipper.cpp b/samplecode/SampleLineClipper.cpp
index 94374b53d3..24eae4c4a9 100644
--- a/samplecode/SampleLineClipper.cpp
+++ b/samplecode/SampleLineClipper.cpp
@@ -209,7 +209,9 @@ protected:
this->inval(NULL);
}
- // fProcIndex = test0(fPts, &fClip);
+ if (false) { // avoid bit rot, suppress warning
+ fProcIndex = test0(fPts, &fClip);
+ }
SkPaint paint, paint1;
diff --git a/samplecode/SampleOverflow.cpp b/samplecode/SampleOverflow.cpp
index 05b28eb818..e8a1196318 100644
--- a/samplecode/SampleOverflow.cpp
+++ b/samplecode/SampleOverflow.cpp
@@ -56,6 +56,7 @@ static void DrawRoundRect() {
#endif
}
+#ifdef SK_SCALAR_IS_FLOATx // FIXME: unclear when if ever this can be enabled
static bool HitTestPath(const SkPath& path, SkScalar x, SkScalar y) {
SkRegion rgn, clip;
@@ -67,11 +68,12 @@ static bool HitTestPath(const SkPath& path, SkScalar x, SkScalar y) {
bool contains = rgn.setPath(path, clip);
return contains;
}
+#endif
static void TestOverflowHitTest() {
SkPath path;
-#ifdef SK_SCALAR_IS_FLOATx
+#ifdef SK_SCALAR_IS_FLOATx // FIXME: unclear when if ever this can be enabled
path.addCircle(0, 0, 70000, SkPath::kCCW_Direction);
SkASSERT(HitTestPath(path, 40000, 40000));
#endif
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index edc7804fb4..4c3721b83c 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -27,17 +27,6 @@
#include "SkGeometry.h" // private include :(
-static void drawtriangle(SkCanvas* canvas, const SkPaint& paint,
- const SkPoint pts[3]) {
- SkPath path;
-
- path.moveTo(pts[0]);
- path.lineTo(pts[1]);
- path.lineTo(pts[2]);
-
- canvas->drawPath(path, paint);
-}
-
static SkShader* make_shader0(SkIPoint* size) {
SkBitmap bm;
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index 5ca39e8651..aa392da5c2 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -77,7 +77,7 @@ protected:
virtual bool onClick(Click* click) {
fCenter.set(click->fCurr.fX, click->fCurr.fY);
this->inval(NULL);
- return NULL;
+ return false;
}
private:
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index b4d540ca43..5eed81eb61 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -323,8 +323,14 @@ protected:
}
virtual void onDrawContent(SkCanvas* canvas) {
-// test_strokerect(canvas); return;
-// test_text(canvas); return;
+ if (false) { // avoid bit rot, suppress warning
+ test_strokerect(canvas);
+ return;
+ }
+ if (false) { // avoid bit rot, suppress warning
+ test_text(canvas);
+ return;
+ }
#ifdef SK_DEBUG
if (true) {
SkRegion a, b, c;
diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp
index bed4835f6c..eb92efdac3 100644
--- a/samplecode/SampleShaderText.cpp
+++ b/samplecode/SampleShaderText.cpp
@@ -35,7 +35,7 @@ static void makebm(SkBitmap* bm, SkBitmap::Config config, int w, int h) {
canvas.drawPaint(paint);
}
-SkShader* MakeBitmapShader(SkShader::TileMode tx, SkShader::TileMode ty,
+static SkShader* MakeBitmapShader(SkShader::TileMode tx, SkShader::TileMode ty,
int w, int h) {
static SkBitmap bmp;
if (bmp.isNull()) {
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index f800f43f51..91f6eb6c2b 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -343,7 +343,7 @@ public:
~Rec() { delete[] fVerts; delete[] fTexs; }
};
-void make_tris(Rec* rec) {
+static void make_tris(Rec* rec) {
int n = 10;
SkRandom rand;
@@ -359,7 +359,7 @@ void make_tris(Rec* rec) {
}
}
-void make_fan(Rec* rec, int texWidth, int texHeight) {
+static void make_fan(Rec* rec, int texWidth, int texHeight) {
const SkScalar tx = SkIntToScalar(texWidth);
const SkScalar ty = SkIntToScalar(texHeight);
const int n = 24;
@@ -389,7 +389,7 @@ void make_fan(Rec* rec, int texWidth, int texHeight) {
m.mapPoints(v, rec->fCount);
}
-void make_strip(Rec* rec, int texWidth, int texHeight) {
+static void make_strip(Rec* rec, int texWidth, int texHeight) {
const SkScalar tx = SkIntToScalar(texWidth);
const SkScalar ty = SkIntToScalar(texHeight);
const int n = 24;
diff --git a/samplecode/SampleStrokeText.cpp b/samplecode/SampleStrokeText.cpp
index f90dc55aec..94b227cb37 100644
--- a/samplecode/SampleStrokeText.cpp
+++ b/samplecode/SampleStrokeText.cpp
@@ -131,7 +131,9 @@ protected:
// paint.setTypeface(Typeface.DEFAULT_BOLD);
lettersToBitmap(&bm, "Test Case", paint, SkBitmap::kARGB_4444_Config);
-
+ if (false) { // avoid bit rot, suppress warning
+ lettersToBitmap2(&bm, "Test Case", paint, SkBitmap::kARGB_4444_Config);
+ }
canvas->drawBitmap(bm, 0, 0);
}
diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index 09134c4502..de1461ff76 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -9,6 +9,7 @@
#include "SkView.h"
#include "SkBlurMaskFilter.h"
#include "SkCanvas.h"
+#include "SkDevice.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
#include "SkImageDecoder.h"
@@ -82,8 +83,10 @@ protected:
canvas->drawText(str, strlen(str), x, y, paint);
y += paint.getFontMetrics(NULL);
}
- //check_for_nonwhite(canvas->getDevice()->accessBitmap(), fByte);
- //SkDebugf("------ byte %x\n", fByte);
+ if (false) { // avoid bit rot, suppress warning
+ check_for_nonwhite(canvas->getDevice()->accessBitmap(false), fByte);
+ SkDebugf("------ byte %x\n", fByte);
+ }
if (false) {
fByte += 1;
diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index 11b1268086..feccf449c4 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp
@@ -76,7 +76,7 @@ class XfermodesBlurView : public SampleView {
#ifdef SK_BUILD_FOR_MAC
static const char* gNames[] = { "Arial", "Times", "Courier", "Lucida" };
- for (int j = 0; j < SK_ARRAY_COUNT(gNames); ++j) {
+ for (size_t j = 0; j < SK_ARRAY_COUNT(gNames); ++j) {
CFStringRef name = CFStringCreateWithCString(NULL, gNames[j], kCFStringEncodingUTF8);
CTFontRef font = CTFontCreateWithName(name, 0, NULL);
SkTypeface* face = SkCreateTypefaceFromCTFont(font);
@@ -99,9 +99,6 @@ public:
const static int W = 64;
const static int H = 64;
XfermodesBlurView() {
- const int W = 64;
- const int H = 64;
-
fBG.setConfig(SkBitmap::kARGB_4444_Config, 2, 2, 4);
fBG.setPixels(gBG);
fBG.setIsOpaque(true);
diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp
index 5e45e37a20..9650a8b2b5 100644
--- a/samplecode/TransitionView.cpp
+++ b/samplecode/TransitionView.cpp
@@ -15,7 +15,7 @@ extern bool is_overview(SkView* view);
static const char gIsTransitionQuery[] = "is-transition";
static const char gReplaceTransitionEvt[] = "replace-transition-view";
-bool is_transition(SkView* view) {
+static bool is_transition(SkView* view) {
SkEvent isTransition(gIsTransitionQuery);
return view->doQuery(&isTransition);
}
@@ -182,6 +182,9 @@ private:
typedef SampleView INHERITED;
};
+// FIXME: this should go in a header
+SkView* create_transition(SkView* prev, SkView* next, int direction);
+
SkView* create_transition(SkView* prev, SkView* next, int direction) {
return SkNEW_ARGS(TransitionView, (prev, next, direction));
-}; \ No newline at end of file
+};
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 04:30:39 +0000