Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-23205][ML] Update ImageSchema.readImages to correctly set alpha values for four-channel images #20389

Closed
wants to merge 3 commits into from
Closed

[SPARK-23205][ML] Update ImageSchema.readImages to correctly set alpha values for four-channel images #20389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
054c1dd
Bugfix + test
smurching Jan 24, 2018
4ec463e
Fix test
smurching Jan 24, 2018
8f1286e
Respond to review comments
smurching Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added data/mllib/images/multi-channel/BGRA_alpha_60.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions mllib/src/main/scala/org/apache/spark/ml/image/ImageSchema.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,11 @@ object ImageSchema {
var offset = 0
for (h <- 0 until height) {
for (w <- 0 until width) {
val color = new Color(img.getRGB(w, h))

val color = new Color(img.getRGB(w, h), hasAlpha)
decoded(offset) = color.getBlue.toByte
decoded(offset + 1) = color.getGreen.toByte
decoded(offset + 2) = color.getRed.toByte
if (nChannels == 4) {
if (hasAlpha) {
decoded(offset + 3) = color.getAlpha.toByte
}
offset += nChannels
Expand Down
9 changes: 6 additions & 3 deletions mllib/src/test/scala/org/apache/spark/ml/image/ImageSchemaSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ class ImageSchemaSuite extends SparkFunSuite with MLlibTestSparkContext {
assert(df.count === 1)

df = readImages(imagePath, null, true, -1, false, 1.0, 0)
assert(df.count === 9)
assert(df.count === 10)

df = readImages(imagePath, null, true, -1, true, 1.0, 0)
val countTotal = df.count
assert(countTotal === 7)
assert(countTotal === 8)

df = readImages(imagePath, null, true, -1, true, 0.5, 0)
// Random number about half of the size of the original dataset
Expand Down Expand Up @@ -103,6 +103,9 @@ class ImageSchemaSuite extends SparkFunSuite with MLlibTestSparkContext {
-71, -58, -56, -73, -64))),
"BGRA.png" -> (("CV_8UC4",
Array[Byte](-128, -128, -8, -1, -128, -128, -8, -1, -128,
-128, -8, -1, 127, 127, -9, -1, 127, 127, -9, -1)))
-128, -8, -1, 127, 127, -9, -1, 127, 127, -9, -1))),
"BGRA_alpha_60.png" -> (("CV_8UC4",
Array[Byte](-128, -128, -8, 60, -128, -128, -8, 60, -128,
-128, -8, 60, 127, 127, -9, 60, 127, 127, -9, 60)))
)
}