updated dependecies to latest version

This commit is contained in:
hrj 2020-06-30 09:02:20 +05:30
parent 8b021c20e5
commit e45302df8c
2 changed files with 8 additions and 10 deletions

View File

@ -6,13 +6,11 @@ lazy val root = (project in file(".")).
version := "0.1.0-SNAPSHOT")), version := "0.1.0-SNAPSHOT")),
name := "LibreCaptcha", name := "LibreCaptcha",
libraryDependencies += "com.sksamuel.scrimage" %% "scrimage-core" % "4.0.5", libraryDependencies += "com.sksamuel.scrimage" % "scrimage-core" % "4.0.5",
libraryDependencies += "com.sksamuel.scrimage" %% "scrimage-io-extra" % "4.0.5", libraryDependencies += "com.sksamuel.scrimage" % "scrimage-filters" % "4.0.5",
libraryDependencies += "com.sksamuel.scrimage" %% "scrimage-filters" % "4.0.5", libraryDependencies += "org.json4s" % "json4s-jackson_2.13" % "3.6.9"
libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.6.9"
) )

View File

@ -22,10 +22,10 @@ class FilterChallenge extends ChallengeProvider {
g.setFont(new Font("Serif", Font.PLAIN, 30)) g.setFont(new Font("Serif", Font.PLAIN, 30))
g.drawString(secret, 5, 30) g.drawString(secret, 5, 30)
g.dispose() g.dispose()
var image = new Image(canvas, ImageMetadata.empty) var image = ImmutableImage.fromAwt(canvas)
val s = scala.util.Random.nextInt(2) val s = scala.util.Random.nextInt(2)
image = filterTypes(s).applyFilter(image) image = filterTypes(s).applyFilter(image)
new Challenge(image.bytes, "image/png", secret) new Challenge(image.bytes(new nio.PngWriter()), "image/png", secret)
} }
def checkAnswer(secret: String, answer: String): Boolean = { def checkAnswer(secret: String, answer: String): Boolean = {
secret == answer secret == answer
@ -33,11 +33,11 @@ class FilterChallenge extends ChallengeProvider {
} }
trait FilterType { trait FilterType {
def applyFilter(image: Image): Image def applyFilter(image: ImmutableImage): ImmutableImage
} }
class FilterType1 extends FilterType { class FilterType1 extends FilterType {
override def applyFilter(image: Image): Image = { override def applyFilter(image: ImmutableImage): ImmutableImage = {
val blur = new GaussianBlurFilter(2) val blur = new GaussianBlurFilter(2)
val smear = new SmearFilter(com.sksamuel.scrimage.filter.SmearType.Circles, 10, 10, 10, 0, 1) val smear = new SmearFilter(com.sksamuel.scrimage.filter.SmearType.Circles, 10, 10, 10, 0, 1)
val diffuse = new DiffuseFilter(2) val diffuse = new DiffuseFilter(2)
@ -49,7 +49,7 @@ class FilterType1 extends FilterType {
} }
class FilterType2 extends FilterType { class FilterType2 extends FilterType {
override def applyFilter(image: Image): Image = { override def applyFilter(image: ImmutableImage): ImmutableImage = {
val smear = new SmearFilter(com.sksamuel.scrimage.filter.SmearType.Circles, 10, 10, 10, 0, 1) val smear = new SmearFilter(com.sksamuel.scrimage.filter.SmearType.Circles, 10, 10, 10, 0, 1)
val diffuse = new DiffuseFilter(1) val diffuse = new DiffuseFilter(1)
val ripple = new RippleFilter(com.sksamuel.scrimage.filter.RippleType.Noise, 1, 1, 0.005.toFloat, 0.005.toFloat) val ripple = new RippleFilter(com.sksamuel.scrimage.filter.RippleType.Noise, 1, 1, 0.005.toFloat, 0.005.toFloat)