Updated test
diff --git a/LottieSample/src/androidTest/java/com/airbnb/lottie/samples/LottieTest.kt b/LottieSample/src/androidTest/java/com/airbnb/lottie/samples/LottieTest.kt
index 26d710b..75568e6 100644
--- a/LottieSample/src/androidTest/java/com/airbnb/lottie/samples/LottieTest.kt
+++ b/LottieSample/src/androidTest/java/com/airbnb/lottie/samples/LottieTest.kt
@@ -768,22 +768,22 @@
drawable.frame = drawable.maxFrame.toInt()
}
- withDrawable("Tests/RGBMarker.json", "Marker", "minAndMax non-inclusive (min)") { drawable ->
+ withDrawable("Tests/RGBMarker.json", "Marker", "->[Green, Blue)") { drawable ->
drawable.setMinAndMaxFrame("Green Section", "Blue Section", false)
drawable.frame = drawable.minFrame.toInt()
}
- withDrawable("Tests/RGBMarker.json", "Marker", "minAndMax inclusive (min)") { drawable ->
+ withDrawable("Tests/RGBMarker.json", "Marker", "->[Green, Blue]") { drawable ->
drawable.setMinAndMaxFrame("Green Section", "Blue Section", true)
drawable.frame = drawable.minFrame.toInt()
}
- withDrawable("Tests/RGBMarker.json", "Marker", "minAndMax non-inclusive (max)") { drawable ->
+ withDrawable("Tests/RGBMarker.json", "Marker", "[Green, Blue)<-") { drawable ->
drawable.setMinAndMaxFrame("Green Section", "Blue Section", false)
drawable.frame = drawable.maxFrame.toInt()
}
- withDrawable("Tests/RGBMarker.json", "Marker", "minAndMax inclusive (max)") { drawable ->
+ withDrawable("Tests/RGBMarker.json", "Marker", "[Green, Blue]<-") { drawable ->
drawable.setMinAndMaxFrame("Green Section", "Blue Section", true)
drawable.frame = drawable.maxFrame.toInt()
}
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
index 153c7d2..f3fbb05 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
@@ -594,7 +594,7 @@
if (endMarkerName == null) {
throw new IllegalArgumentException("Cannot find marker with name " + endMarkerName + ".");
}
- int endFrame = (int) (endMarker.startFrame + (playEndMarkerStartFrame ? 0.99f : 0f));
+ int endFrame = (int) (endMarker.startFrame + (playEndMarkerStartFrame ? 1f : 0f));
setMinAndMaxFrame(startFrame, endFrame);
}
