eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

getNative() did not have the correct return type

Browse Source
This commit is contained in:
benfry
2012-09-10 15:45:23 +00:00
parent f69fe94b5a
commit 6230142d06
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/core/src/processing/core/PFont.java
+1 -1
View File
@@ -438,7 +438,7 @@ public class PFont implements PConstants {
/**
* Return the native Typeface object associated with this PFont (if any).
*/
public Typeface getNative() {
public Object getNative() {
if (subsetting) {
return null;
}
android/core/src/processing/core/PGraphicsAndroid2D.java
+4 -4
View File
@@ -1112,7 +1112,7 @@ public class PGraphicsAndroid2D extends PGraphics {
@Override
public void textFont(PFont which) {
super.textFont(which);
fillPaint.setTypeface(which.getNative());
fillPaint.setTypeface((Typeface) which.getNative());
}
@@ -1143,7 +1143,7 @@ public class PGraphicsAndroid2D extends PGraphics {
defaultFontOrDeath("textSize", size);
}
Typeface font = textFont.getNative();
Typeface font = (Typeface) textFont.getNative();
if (font != null) {
fillPaint.setTextSize(size);
}
@@ -1176,7 +1176,7 @@ public class PGraphicsAndroid2D extends PGraphics {
@Override
protected float textWidthImpl(char buffer[], int start, int stop) {
// Font font = textFont.getFont();
Typeface font = textFont.getNative();
Typeface font = (Typeface) textFont.getNative();
if (font == null) {
return super.textWidthImpl(buffer, start, stop);
}
@@ -1209,7 +1209,7 @@ public class PGraphicsAndroid2D extends PGraphics {
@Override
protected void textLineImpl(char buffer[], int start, int stop,
float x, float y) {
Typeface font = textFont.getNative();
Typeface font = (Typeface) textFont.getNative();
if (font == null) {
showWarning("Inefficient font rendering: use createFont() with a TTF/OTF instead of loadFont().");
//new Exception().printStackTrace(System.out);