Skip to content

Commit

Permalink
Fix native compilation warnings on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonsky
tonsky committed Dec 9, 2020
1 parent e1fd834 commit 06072fc
Show file tree
Hide file tree
Showing 21 changed files with 68 additions and 52 deletions.
1 change: 0 additions & 1 deletion examples/lwjgl/script/build_incremental.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ add_cp() {
}

add_cp "org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar"
add_cp "org/jetbrains/annotations/19.0.0/annotations-19.0.0.jar"
add_cp "org/lwjgl/lwjgl/3.2.3/lwjgl-3.2.3.jar"
add_cp "org/lwjgl/lwjgl-glfw/3.2.3/lwjgl-glfw-3.2.3.jar"
add_cp "org/lwjgl/lwjgl-opengl/3.2.3/lwjgl-opengl-3.2.3.jar"
Expand Down
12 changes: 12 additions & 0 deletions examples/lwjgl/script/run.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
java -Djava.awt.headless=true -ea -esa ^
-cp target\classes;^
..\..\shared\target\classes;^
..\..\native\target\classes;^
%HOMEPATH%/.m2/repository/org/jetbrains/skija/skija-shared/0.0.0-SNAPSHOT/skija-shared-0.0.0-SNAPSHOT.jar;^
%HOMEPATH%/.m2/repository/org/lwjgl/lwjgl/3.2.3/lwjgl-3.2.3.jar;^
%HOMEPATH%/.m2/repository/org/lwjgl/lwjgl-glfw/3.2.3/lwjgl-glfw-3.2.3.jar;^
%HOMEPATH%/.m2/repository/org/lwjgl/lwjgl-opengl/3.2.3/lwjgl-opengl-3.2.3.jar;^
%HOMEPATH%/.m2/repository/org/lwjgl/lwjgl/3.2.3/lwjgl-3.2.3-natives-windows.jar;^
%HOMEPATH%/.m2/repository/org/lwjgl/lwjgl-glfw/3.2.3/lwjgl-glfw-3.2.3-natives-windows.jar;^
%HOMEPATH%/.m2/repository/org/lwjgl/lwjgl-opengl/3.2.3/lwjgl-opengl-3.2.3-natives-windows.jar ^
org.jetbrains.skija.examples.lwjgl.Main
1 change: 0 additions & 1 deletion examples/lwjgl/script/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ add_cp() {
classpath=$classpath:$HOME/.m2/repository/$lib
}

add_cp "org/jetbrains/annotations/19.0.0/annotations-19.0.0.jar"
add_cp "org/lwjgl/lwjgl/3.2.3/lwjgl-3.2.3.jar"
add_cp "org/lwjgl/lwjgl-glfw/3.2.3/lwjgl-glfw-3.2.3.jar"
add_cp "org/lwjgl/lwjgl-opengl/3.2.3/lwjgl-opengl-3.2.3.jar"
Expand Down
2 changes: 0 additions & 2 deletions examples/lwjgl/src/main/java/org/jetbrains/skija/examples/lwjgl/DebugTextBlobHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.*;
import java.util.stream.*;
import org.jetbrains.annotations.*;
import org.jetbrains.skija.*;
import org.jetbrains.skija.shaper.*;

Expand Down Expand Up @@ -84,7 +83,6 @@ public void commitLine() {
_yPos += _maxRunDescent + _maxRunLeading;
}

@Nullable
public TextBlob makeBlob() {
return _builder.build();
}
Expand Down
1 change: 0 additions & 1 deletion examples/lwjgl/src/main/java/org/jetbrains/skija/examples/lwjgl/WallOfTextScene.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import java.nio.file.*;
import java.util.stream.*;
import lombok.*;
import org.jetbrains.annotations.*;
import org.jetbrains.skija.*;
import org.jetbrains.skija.shaper.*;
import org.jetbrains.skija.paragraph.*;
Expand Down
4 changes: 2 additions & 2 deletions native/script/build.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ mkdir ..\target\classes

rem Build C++
cd build
cmake -G Ninja -DSKIA_DIR=%SKIA_DIR% ..
cmake -G Ninja -DSKIA_DIR=..\Skia-m88-b05f80697a-windows-Release-x64 ..
ninja
cd ..

rem Copy icudtl.dat
copy %SKIA_DIR%\out\Release-x64\icudtl.dat build
copy Skia-m88-b05f80697a-windows-Release-x64\out\Release-x64\icudtl.dat build

rem rem Copy to classes
rem copy build\*skija.* ..\classes
3 changes: 3 additions & 0 deletions native/script/clean.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rmdir /s /q build
rmdir /s /q target
rmdir /s /q "%HOMEPATH%/.m2/repository/org/jetbrains/skija/skija-native/0.0.0-SNAPSHOT"
6 changes: 3 additions & 3 deletions native/src/Data.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nSize
extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Data__1nBytes
(JNIEnv* env, jclass jclass, jlong ptr, jlong offset, jlong length) {
SkData* instance = reinterpret_cast<SkData*>(static_cast<uintptr_t>(ptr));
jbyteArray bytesArray = env->NewByteArray(length);
jbyteArray bytesArray = env->NewByteArray((jsize) length);
const jbyte* bytes = reinterpret_cast<const jbyte*>(instance->bytes() + offset);
env->SetByteArrayRegion(bytesArray, 0, length, bytes);
env->SetByteArrayRegion(bytesArray, 0, (jsize) length, bytes);
return bytesArray;
}

Expand All @@ -37,7 +37,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nMakeFromByte
(JNIEnv* env, jclass jclass, jbyteArray bytesArray, jlong offset, jlong length) {
jbyte* bytes = reinterpret_cast<jbyte*>(malloc(length));
if (!bytes) return 0;
env->GetByteArrayRegion(bytesArray, offset, length, bytes);
env->GetByteArrayRegion(bytesArray, (jsize) offset, (jsize) length, bytes);
SkData* instance = SkData::MakeFromMalloc(bytes, length).release();
return reinterpret_cast<jlong>(instance);
}
Expand Down
4 changes: 2 additions & 2 deletions native/src/Font.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Font__1nMeasureTex
jsize len = env->GetStringLength(str);
const jchar* chars = env->GetStringCritical(str, nullptr);
SkRect bounds;
int count = instance->measureText(chars, len * sizeof(jchar), SkTextEncoding::kUTF16, &bounds, paint);
instance->measureText(chars, len * sizeof(jchar), SkTextEncoding::kUTF16, &bounds, paint);
env->ReleaseStringCritical(str, chars);
return skija::Rect::fromSkRect(env, bounds);
}
Expand Down Expand Up @@ -341,7 +341,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetPa

struct Ctx {
jobjectArray paths;
size_t idx;
jsize idx;
JNIEnv* env;
} ctx = { env->NewObjectArray(count, skija::Path::cls, nullptr), 0, env };

Expand Down
2 changes: 1 addition & 1 deletion native/src/FontMgr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFami
for (int i = 0; i < bcp47.size(); ++i)
bcp47[i] = bcp47Strings[i].c_str();

SkTypeface* typeface = instance->matchFamilyStyleCharacter(familyName.c_str(), skija::FontStyle::fromJava(fontStyle), bcp47.data(), bcp47.size(), character);
SkTypeface* typeface = instance->matchFamilyStyleCharacter(familyName.c_str(), skija::FontStyle::fromJava(fontStyle), bcp47.data(), (int) bcp47.size(), character);

return reinterpret_cast<jlong>(typeface);
}
Expand Down
6 changes: 3 additions & 3 deletions native/src/Path.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetVerbs(JNIE

extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nApproximateBytesUsed(JNIEnv* env, jclass jclass, jlong ptr) {
SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
return instance->approximateBytesUsed();
return (jint) instance->approximateBytesUsed();
}

extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nSwap(JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
Expand Down Expand Up @@ -439,8 +439,8 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nDumpHex
extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Path__1nSerializeToBytes
(JNIEnv* env, jclass jclass, jlong ptr) {
SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
int count = instance->writeToMemory(nullptr);
jbyteArray bytesArray = env->NewByteArray(count);
size_t count = instance->writeToMemory(nullptr);
jbyteArray bytesArray = env->NewByteArray((jsize) count);
jbyte* bytes = env->GetByteArrayElements(bytesArray, 0);
instance->writeToMemory(bytes);
env->ReleaseByteArrayElements(bytesArray, bytes, 0);
Expand Down
2 changes: 1 addition & 1 deletion native/src/Typeface.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nG
names.push_back(name);
}
iter->unref();
jobjectArray res = env->NewObjectArray(names.size(), skija::FontFamilyName::cls, nullptr);
jobjectArray res = env->NewObjectArray((jsize) names.size(), skija::FontFamilyName::cls, nullptr);
for (int i = 0; i < names.size(); ++i) {
jstring nameStr = javaString(env, names[i].fString);
jstring langStr = javaString(env, names[i].fLanguage);
Expand Down
42 changes: 21 additions & 21 deletions native/src/interop.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ namespace skija {
}

jobjectArray fromSkPoints(JNIEnv* env, const std::vector<SkPoint>& ps) {
jobjectArray res = env->NewObjectArray(ps.size(), cls, nullptr);
jobjectArray res = env->NewObjectArray((jsize) ps.size(), cls, nullptr);
for (int i = 0; i < ps.size(); ++i) {
env->SetObjectArrayElement(res, i, fromSkPoint(env, ps[i]));
}
Expand Down Expand Up @@ -829,42 +829,42 @@ jlong packTwoInt32(SkISize p) {
}

jbyteArray javaByteArray(JNIEnv* env, const std::vector<jbyte>& bytes) {
jbyteArray res = env->NewByteArray(bytes.size());
env->SetByteArrayRegion(res, 0, bytes.size(), bytes.data());
jbyteArray res = env->NewByteArray((jsize) bytes.size());
env->SetByteArrayRegion(res, 0, (jsize) bytes.size(), bytes.data());
return res;
}

jshortArray javaShortArray(JNIEnv* env, const std::vector<jshort>& shorts) {
jshortArray res = env->NewShortArray(shorts.size());
env->SetShortArrayRegion(res, 0, shorts.size(), shorts.data());
jshortArray res = env->NewShortArray((jsize) shorts.size());
env->SetShortArrayRegion(res, 0, (jsize) shorts.size(), shorts.data());
return res;
}

jintArray javaIntArray(JNIEnv* env, const std::vector<jint>& ints) {
jintArray res = env->NewIntArray(ints.size());
env->SetIntArrayRegion( res, 0, ints.size(), ints.data());
jintArray res = env->NewIntArray((jsize) ints.size());
env->SetIntArrayRegion( res, 0, (jsize) ints.size(), ints.data());
return res;
}

jlongArray javaLongArray(JNIEnv* env, const std::vector<jlong>& longs) {
jlongArray res = env->NewLongArray(longs.size());
env->SetLongArrayRegion(res, 0, longs.size(), longs.data());
jlongArray res = env->NewLongArray((jsize) longs.size());
env->SetLongArrayRegion(res, 0, (jsize) longs.size(), longs.data());
return res;
}

jfloatArray javaFloatArray(JNIEnv* env, const std::vector<jfloat>& floats) {
jfloatArray res = env->NewFloatArray(floats.size());
env->SetFloatArrayRegion(res, 0, floats.size(), floats.data());
jfloatArray res = env->NewFloatArray((jsize) floats.size());
env->SetFloatArrayRegion(res, 0, (jsize) floats.size(), floats.data());
return res;
}

std::vector<SkString> skStringVector(JNIEnv* env, jobjectArray arr) {
if (arr == nullptr) {
return std::vector<SkString>(0);
} else {
size_t len = env->GetArrayLength(arr);
jsize len = env->GetArrayLength(arr);
std::vector<SkString> res(len);
for (int i = 0; i < len; ++i) {
for (jint i = 0; i < len; ++i) {
jstring str = static_cast<jstring>(env->GetObjectArrayElement(arr, i));
res[i] = skString(env, str);
}
Expand All @@ -873,8 +873,8 @@ std::vector<SkString> skStringVector(JNIEnv* env, jobjectArray arr) {
}

jobjectArray javaStringArray(JNIEnv* env, const std::vector<SkString>& strings) {
jobjectArray res = env->NewObjectArray(strings.size(), java::lang::String::cls, nullptr);
for (int i = 0; i < strings.size(); ++i)
jobjectArray res = env->NewObjectArray((jsize) strings.size(), java::lang::String::cls, nullptr);
for (jint i = 0; i < (jsize) strings.size(); ++i)
env->SetObjectArrayElement(res, i, javaString(env, strings[i]));
return res;
}
Expand All @@ -894,7 +894,7 @@ skija::UtfIndicesConverter::UtfIndicesConverter(const SkString& str):
skija::UtfIndicesConverter::UtfIndicesConverter(str.c_str(), str.size())
{}

size_t skija::UtfIndicesConverter::from16To8(size_t i16) {
size_t skija::UtfIndicesConverter::from16To8(uint32_t i16) {
if (i16 >= fPos16) {
// if new i16 >= last fPos16, continue from where we started
} else {
Expand All @@ -904,23 +904,23 @@ size_t skija::UtfIndicesConverter::from16To8(size_t i16) {

while (fPtr8 < fEnd8 && fPos16 < i16) {
SkUnichar u = SkUTF::NextUTF8(&fPtr8, fEnd8);
fPos16 += SkUTF::ToUTF16(u);
fPos16 += (uint32_t) SkUTF::ToUTF16(u);
}

return fPtr8 - fStart8;
}

size_t skija::UtfIndicesConverter::from8To16(size_t i8) {
if (i8 >= fPtr8 - fStart8) {
uint32_t skija::UtfIndicesConverter::from8To16(size_t i8) {
if (i8 >= (size_t) (fPtr8 - fStart8)) {
// if new i8 >= last fPtr8, continue from where we started
} else {
fPtr8 = fStart8;
fPos16 = 0;
}

while (fPtr8 - fStart8 < i8) {
while ((size_t) (fPtr8 - fStart8) < i8) {
SkUnichar u = SkUTF::NextUTF8(&fPtr8, fEnd8);
fPos16 += SkUTF::ToUTF16(u);
fPos16 += (uint32_t) SkUTF::ToUTF16(u);
}

return fPos16;
Expand Down
6 changes: 3 additions & 3 deletions native/src/interop.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ namespace skija {
const char* fStart8;
const char* fPtr8;
const char* fEnd8;
size_t fPos16;
uint32_t fPos16;

size_t from16To8(size_t i16);
size_t from8To16(size_t i8);
size_t from16To8(uint32_t i16);
uint32_t from8To16(size_t i8);
};
}

Expand Down
4 changes: 2 additions & 2 deletions native/src/paragraph/FontCollection.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ extern "C" JNIEXPORT jlongArray JNICALL Java_org_jetbrains_skija_paragraph_FontC
for (int i = 0; i < found.size(); ++i)
res[i] = reinterpret_cast<jlong>(found[i].release());

jlongArray resArray = env->NewLongArray(found.size());
env->SetLongArrayRegion(resArray, 0, found.size(), res.data());
jlongArray resArray = env->NewLongArray((jsize) found.size());
env->SetLongArrayRegion(resArray, 0, (jsize) found.size(), res.data());
return resArray;
}

Expand Down
6 changes: 3 additions & 3 deletions native/src/paragraph/Paragraph.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_paragraph_Par
(JNIEnv* env, jclass jclass, jlong ptr, jint start, jint end, jint rectHeightStyle, jint rectWidthStyle) {
Paragraph* instance = reinterpret_cast<Paragraph*>(static_cast<uintptr_t>(ptr));
std::vector<TextBox> rects = instance->getRectsForRange(start, end, static_cast<RectHeightStyle>(rectHeightStyle), static_cast<RectWidthStyle>(rectWidthStyle));
jobjectArray rectsArray = env->NewObjectArray(rects.size(), skija::paragraph::TextBox::cls, nullptr);
jobjectArray rectsArray = env->NewObjectArray((jsize) rects.size(), skija::paragraph::TextBox::cls, nullptr);
for (int i = 0; i < rects.size(); ++i) {
TextBox box = rects[i];
jobject boxObj = env->NewObject(skija::paragraph::TextBox::cls, skija::paragraph::TextBox::ctor, box.rect.fLeft, box.rect.fTop, box.rect.fRight, box.rect.fBottom, static_cast<jint>(box.direction));
Expand All @@ -96,7 +96,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_paragraph_Par
(JNIEnv* env, jclass jclass, jlong ptr) {
Paragraph* instance = reinterpret_cast<Paragraph*>(static_cast<uintptr_t>(ptr));
std::vector<TextBox> rects = instance->getRectsForPlaceholders();
jobjectArray rectsArray = env->NewObjectArray(rects.size(), skija::paragraph::TextBox::cls, nullptr);
jobjectArray rectsArray = env->NewObjectArray((jsize) rects.size(), skija::paragraph::TextBox::cls, nullptr);
for (int i = 0; i < rects.size(); ++i) {
TextBox box = rects[i];
jobject boxObj = env->NewObject(skija::paragraph::TextBox::cls, skija::paragraph::TextBox::ctor, box.rect.fLeft, box.rect.fTop, box.rect.fRight, box.rect.fBottom, static_cast<jint>(box.direction));
Expand Down Expand Up @@ -130,7 +130,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_paragraph_Par
if (!text) text = &empty;
std::vector<LineMetrics> res;
instance->getLineMetrics(res);
jobjectArray resArray = env->NewObjectArray(res.size(), skija::paragraph::LineMetrics::cls, nullptr);
jobjectArray resArray = env->NewObjectArray((jsize) res.size(), skija::paragraph::LineMetrics::cls, nullptr);
auto conv = skija::UtfIndicesConverter(*text);
for (int i = 0; i < res.size(); ++i) {
LineMetrics lm = res[i];
Expand Down
4 changes: 2 additions & 2 deletions native/src/paragraph/TextStyle.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_paragraph_Tex
(JNIEnv* env, jclass jclass, jlong ptr) {
TextStyle* instance = reinterpret_cast<TextStyle*>(static_cast<uintptr_t>(ptr));
std::vector<TextShadow> shadows = instance->getShadows();
jobjectArray shadowsArr = env->NewObjectArray(shadows.size(), skija::paragraph::Shadow::cls, nullptr);
jobjectArray shadowsArr = env->NewObjectArray((jsize) shadows.size(), skija::paragraph::Shadow::cls, nullptr);
for (int i = 0; i < shadows.size(); ++i) {
const TextShadow& s = shadows[i];
env->SetObjectArrayElement(shadowsArr, i, env->NewObject(skija::paragraph::Shadow::cls, skija::paragraph::Shadow::ctor, s.fColor, s.fOffset.fX, s.fOffset.fY, s.fBlurRadius));
Expand All @@ -154,7 +154,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_paragraph_Tex
(JNIEnv* env, jclass jclass, jlong ptr) {
TextStyle* instance = reinterpret_cast<TextStyle*>(static_cast<uintptr_t>(ptr));
std::vector<FontFeature> fontFeatures = instance->getFontFeatures();
jobjectArray fontFeaturesArr = env->NewObjectArray(fontFeatures.size(), skija::FontFeature::cls, nullptr);
jobjectArray fontFeaturesArr = env->NewObjectArray((jsize) fontFeatures.size(), skija::FontFeature::cls, nullptr);
for (int i = 0; i < fontFeatures.size(); ++i) {
const FontFeature& ff = fontFeatures[i];
env->SetObjectArrayElement(fontFeaturesArr, i, env->NewObject(skija::FontFeature::cls, skija::FontFeature::ctor, javaString(env, ff.fName), ff.fValue));
Expand Down
2 changes: 1 addition & 1 deletion native/src/shaper/IcuBidiRunIterator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_shaper_IcuBidiRunIterator__1nMake
(JNIEnv* env, jclass jclass, jlong textPtr, jint bidiLevel) {
SkString* text = reinterpret_cast<SkString*>(static_cast<uintptr_t>(textPtr));
std::unique_ptr<SkShaper::BiDiRunIterator> instance(SkShaper::MakeIcuBiDiRunIterator(text->c_str(), text->size(), bidiLevel));
std::unique_ptr<SkShaper::BiDiRunIterator> instance(SkShaper::MakeIcuBiDiRunIterator(text->c_str(), text->size(), bidiLevel & 0xFF));
return reinterpret_cast<jlong>(instance.release());
}

Expand Down
4 changes: 2 additions & 2 deletions native/src/shaper/Shaper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class SkijaBidiRunIterator: public SkijaRunIterator<SkShaper::BiDiRunIterator> {
}

jint onConsume(jobject runObj) override {
fLevel = fEnv->GetIntField(runObj, skija::shaper::BidiRun::_level);
fLevel = fEnv->GetIntField(runObj, skija::shaper::BidiRun::_level) & 0xFF;
return fEnv->GetIntField(runObj, skija::shaper::BidiRun::_end);
}

Expand All @@ -173,7 +173,7 @@ class SkijaScriptRunIterator: public SkijaRunIterator<SkShaper::ScriptRunIterato
}

protected:
uint8_t fScript;
uint32_t fScript;
};

class SkijaLanguageRunIterator: public SkijaRunIterator<SkShaper::LanguageRunIterator> {
Expand Down
6 changes: 6 additions & 0 deletions script/install.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cd shared
call script\install.cmd
cd ..\native
call script\build.cmd
call script\install.cmd
cd ..
2 changes: 1 addition & 1 deletion shared/script/install.cmd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mvn -DskipTests install
call mvn -DskipTests install

0 comments on commit 06072fc

Please sign in to comment.