Skip to content

Commit 8e3a95e

Browse files
JakubValtarJakubValtar
committed
Rename low/high to min/max
1 parent 5f57e24 commit 8e3a95e

1 file changed

Lines changed: 32 additions & 32 deletions

File tree

‎core/src/processing/core/PImage.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,8 +1967,8 @@ private void blit_resize(PImage img,
19671967
destY1 = 0;
19681968
}
19691969

1970-
destW = low(destW, screenW - destX1);
1971-
destH = low(destH, screenH - destY1);
1970+
destW = min(destW, screenW - destX1);
1971+
destH = min(destH, screenH - destY1);
19721972

19731973
int destOffset = destY1 * screenW + destX1;
19741974
srcBuffer = img.pixels;
@@ -2418,7 +2418,7 @@ private void filter_new_scanline() {
24182418
fracV = srcYOffset & PREC_MAXVAL;
24192419
ifV = PREC_MAXVAL - fracV + 1;
24202420
v1 = (srcYOffset >> PRECISIONB) * iw;
2421-
v2 = low((srcYOffset >> PRECISIONB) + 1, ih1) * iw;
2421+
v2 = min((srcYOffset >> PRECISIONB) + 1, ih1) * iw;
24222422
}
24232423

24242424

@@ -2430,7 +2430,7 @@ private int filter_bilinear() {
24302430
ur = ifV - ul;
24312431
lr = PREC_MAXVAL + 1 - ul - ll - ur;
24322432
u1 = (sX >> PRECISIONB);
2433-
u2 = low(u1 + 1, iw1);
2433+
u2 = min(u1 + 1, iw1);
24342434

24352435
// get color values of the 4 neighbouring texels
24362436
cUL = srcBuffer[v1 + u1];
@@ -2464,12 +2464,12 @@ private int filter_bilinear() {
24642464
// internal blending methods
24652465

24662466

2467-
private static int low(int a, int b) {
2467+
private static int min(int a, int b) {
24682468
return (a < b) ? a : b;
24692469
}
24702470

24712471

2472-
private static int high(int a, int b) {
2472+
private static int max(int a, int b) {
24732473
return (a > b) ? a : b;
24742474
}
24752475

@@ -2578,7 +2578,7 @@ private static int blend_blend(int dst, int src) {
25782578
int s_a = a + (a >= 0x7F ? 1 : 0);
25792579
int d_a = 0x100 - s_a;
25802580

2581-
return low((dst >>> 24) + a, 0xFF) << 24 |
2581+
return min((dst >>> 24) + a, 0xFF) << 24 |
25822582
((dst & RB_MASK) * d_a + (src & RB_MASK) * s_a) >>> 8 & RB_MASK |
25832583
((dst & GN_MASK) * d_a + (src & GN_MASK) * s_a) >>> 8 & GN_MASK;
25842584
}
@@ -2596,10 +2596,10 @@ private static int blend_add_pin(int dst, int src) {
25962596
int rb = (dst & RB_MASK) + ((src & RB_MASK) * s_a >>> 8 & RB_MASK);
25972597
int gn = (dst & GN_MASK) + ((src & GN_MASK) * s_a >>> 8);
25982598

2599-
return low((dst >>> 24) + a, 0xFF) << 24 |
2600-
low(rb & 0xFFFF0000, RED_MASK) |
2601-
low(gn & 0x00FFFF00, GREEN_MASK) |
2602-
low(rb & 0x0000FFFF, BLUE_MASK);
2599+
return min((dst >>> 24) + a, 0xFF) << 24 |
2600+
min(rb & 0xFFFF0000, RED_MASK) |
2601+
min(gn & 0x00FFFF00, GREEN_MASK) |
2602+
min(rb & 0x0000FFFF, BLUE_MASK);
26032603
}
26042604

26052605

@@ -2615,10 +2615,10 @@ private static int blend_sub_pin(int dst, int src) {
26152615
int rb = ((src & RB_MASK) * s_a >>> 8);
26162616
int gn = ((src & GREEN_MASK) * s_a >>> 8);
26172617

2618-
return low((dst >>> 24) + a, 0xFF) << 24 |
2619-
high((dst & RED_MASK) - (rb & RED_MASK), 0) |
2620-
high((dst & GREEN_MASK) - (gn & GREEN_MASK), 0) |
2621-
high((dst & BLUE_MASK) - (rb & BLUE_MASK), 0);
2618+
return min((dst >>> 24) + a, 0xFF) << 24 |
2619+
max((dst & RED_MASK) - (rb & RED_MASK), 0) |
2620+
max((dst & GREEN_MASK) - (gn & GREEN_MASK), 0) |
2621+
max((dst & BLUE_MASK) - (rb & BLUE_MASK), 0);
26222622
}
26232623

26242624

@@ -2632,11 +2632,11 @@ private static int blend_lightest(int dst, int src) {
26322632
int s_a = a + (a >= 0x7F ? 1 : 0);
26332633
int d_a = 0x100 - s_a;
26342634

2635-
int rb = high(src & RED_MASK, dst & RED_MASK) |
2636-
high(src & BLUE_MASK, dst & BLUE_MASK);
2637-
int gn = high(src & GREEN_MASK, dst & GREEN_MASK);
2635+
int rb = max(src & RED_MASK, dst & RED_MASK) |
2636+
max(src & BLUE_MASK, dst & BLUE_MASK);
2637+
int gn = max(src & GREEN_MASK, dst & GREEN_MASK);
26382638

2639-
return low((dst >>> 24) + a, 0xFF) << 24 |
2639+
return min((dst >>> 24) + a, 0xFF) << 24 |
26402640
((dst & RB_MASK) * d_a + rb * s_a) >>> 8 & RB_MASK |
26412641
((dst & GN_MASK) * d_a + gn * s_a) >>> 8 & GN_MASK;
26422642
}
@@ -2652,11 +2652,11 @@ private static int blend_darkest(int dst, int src) {
26522652
int s_a = a + (a >= 0x7F ? 1 : 0);
26532653
int d_a = 0x100 - s_a;
26542654

2655-
int rb = low(src & RED_MASK, dst & RED_MASK) |
2656-
low(src & BLUE_MASK, dst & BLUE_MASK);
2657-
int gn = low(src & GREEN_MASK, dst & GREEN_MASK);
2655+
int rb = min(src & RED_MASK, dst & RED_MASK) |
2656+
min(src & BLUE_MASK, dst & BLUE_MASK);
2657+
int gn = min(src & GREEN_MASK, dst & GREEN_MASK);
26582658

2659-
return low((dst >>> 24) + a, 0xFF) << 24 |
2659+
return min((dst >>> 24) + a, 0xFF) << 24 |
26602660
((dst & RB_MASK) * d_a + rb * s_a) >>> 8 & RB_MASK |
26612661
((dst & GN_MASK) * d_a + gn * s_a) >>> 8 & GN_MASK;
26622662
}
@@ -2680,7 +2680,7 @@ private static int blend_difference(int dst, int src) {
26802680
(b < 0 ? -b : b);
26812681
int gn = (g < 0 ? -g : g);
26822682

2683-
return low((dst >>> 24) + a, 0xFF) << 24 |
2683+
return min((dst >>> 24) + a, 0xFF) << 24 |
26842684
((dst & RB_MASK) * d_a + rb * s_a) >>> 8 & RB_MASK |
26852685
((dst & GN_MASK) * d_a + gn * s_a) >>> 8 & GN_MASK;
26862686
}
@@ -2712,7 +2712,7 @@ private static int blend_exclusion(int dst, int src) {
27122712
int gn_sub = s_gn * (d_gn + (d_gn >= 0x7F00 ? 0x100 : 0))
27132713
>>> 15 & 0x0001FF00;
27142714

2715-
return low((dst >>> 24) + a, 0xFF) << 24 |
2715+
return min((dst >>> 24) + a, 0xFF) << 24 |
27162716
(d_rb * d_a + (d_rb + (src & RB_MASK) - rb_sub) * s_a) >>> 8 & RB_MASK |
27172717
(d_gn * d_a + (d_gn + s_gn - gn_sub) * s_a) >>> 8 & GN_MASK;
27182718
}
@@ -2741,7 +2741,7 @@ private static int blend_multiply(int dst, int src) {
27412741
(src & GREEN_MASK) * (d_gn + 0x100)
27422742
>>> 16 & GN_MASK;
27432743

2744-
return low((dst >>> 24) + a, 0xFF) << 24 |
2744+
return min((dst >>> 24) + a, 0xFF) << 24 |
27452745
((dst & RB_MASK) * d_a + rb * s_a) >>> 8 & RB_MASK |
27462746
(d_gn * d_a + gn * s_a) >>> 8 & GN_MASK;
27472747
}
@@ -2773,7 +2773,7 @@ private static int blend_screen(int dst, int src) {
27732773
int gn_sub = s_gn * (d_gn + 0x100)
27742774
>>> 16 & GN_MASK;
27752775

2776-
return low((dst >>> 24) + a, 0xFF) << 24 |
2776+
return min((dst >>> 24) + a, 0xFF) << 24 |
27772777
(d_rb * d_a + (d_rb + (src & RB_MASK) - rb_sub) * s_a) >>> 8 & RB_MASK |
27782778
(d_gn * d_a + (d_gn + s_gn - gn_sub) * s_a) >>> 8 & GN_MASK;
27792779
}
@@ -2808,7 +2808,7 @@ private static int blend_overlay(int dst, int src) {
28082808
d_b * (s_b + 1) >>> 7 :
28092809
(0xFF00 - ((0x100 - s_b) * (BLUE_MASK - d_b) << 1)) >>> 8;
28102810

2811-
return low((dst >>> 24) + a, 0xFF) << 24 |
2811+
return min((dst >>> 24) + a, 0xFF) << 24 |
28122812
((dst & RB_MASK) * d_a + ((r | b) & RB_MASK) * s_a) >>> 8 & RB_MASK |
28132813
((dst & GN_MASK) * d_a + (g & GN_MASK) * s_a) >>> 8 & GN_MASK;
28142814
}
@@ -2845,7 +2845,7 @@ private static int blend_hard_light(int dst, int src) {
28452845
s_b * (d_b + 1) >>> 7 :
28462846
(0xFF00 - ((0x100 - d_b) * (BLUE_MASK - s_b) << 1)) >>> 8;
28472847

2848-
return low((dst >>> 24) + a, 0xFF) << 24 |
2848+
return min((dst >>> 24) + a, 0xFF) << 24 |
28492849
((dst & RB_MASK) * d_a + ((r | b) & RB_MASK) * s_a) >>> 8 & RB_MASK |
28502850
((dst & GN_MASK) * d_a + (g & GN_MASK) * s_a) >>> 8 & GN_MASK;
28512851
}
@@ -2882,7 +2882,7 @@ private static int blend_soft_light(int dst, int src) {
28822882
int b = (s_b1 * d_b << 9) + 0xFF * d_b1 * (d_b1 + 1) -
28832883
((s_b1 * d_b1 * d_b1) << 1) >>> 16;
28842884

2885-
return low((dst >>> 24) + a, 0xFF) << 24 |
2885+
return min((dst >>> 24) + a, 0xFF) << 24 |
28862886
((dst & RB_MASK) * d_a + (r | b) * s_a) >>> 8 & RB_MASK |
28872887
((dst & GN_MASK) * d_a + g * s_a) >>> 8 & GN_MASK;
28882888
}
@@ -2908,7 +2908,7 @@ private static int blend_dodge(int dst, int src) {
29082908
int gn =
29092909
(g > 0xFF00 ? 0x00FF00 : (g & GREEN_MASK));
29102910

2911-
return low((dst >>> 24) + a, 0xFF) << 24 |
2911+
return min((dst >>> 24) + a, 0xFF) << 24 |
29122912
((dst & RB_MASK) * d_a + rb * s_a) >>> 8 & RB_MASK |
29132913
((dst & GN_MASK) * d_a + gn * s_a) >>> 8 & GN_MASK;
29142914
}
@@ -2934,7 +2934,7 @@ private static int blend_burn(int dst, int src) {
29342934
int gn = GN_MASK -
29352935
(g > 0xFF00 ? 0x00FF00 : (g & GREEN_MASK));
29362936

2937-
return low((dst >>> 24) + a, 0xFF) << 24 |
2937+
return min((dst >>> 24) + a, 0xFF) << 24 |
29382938
((dst & RB_MASK) * d_a + rb * s_a) >>> 8 & RB_MASK |
29392939
((dst & GN_MASK) * d_a + gn * s_a) >>> 8 & GN_MASK;
29402940
}

0 commit comments

Comments
 (0)