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

remove javafx #74

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove javafx #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/main/java/dev/brachtendorf/jimagehash/hash/FuzzyHash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.brachtendorf.jimagehash.hash;

import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
Expand All @@ -12,7 +13,6 @@

import dev.brachtendorf.graphics.ColorUtil;
import dev.brachtendorf.jimagehash.hashAlgorithms.HashingAlgorithm;
import javafx.scene.paint.Color;

/**
* A fuzzy hash is an aggregation of multiple hashes mapped to a single mean
Expand Down Expand Up @@ -818,8 +818,8 @@ public BufferedImage toImage(int blockSize) {
ensureUpToDateHash();

// Build color palette
Color[] lowerCol = ColorUtil.ColorPalette.getPalette(15, Color.web("#ff642b"), Color.web("#ffff7c"));
Color[] higherCol = ColorUtil.ColorPalette.getPalette(15, Color.web("#ffff7c"), Color.GREEN);
Color[] lowerCol = ColorUtil.ColorPalette.getPalette(15, Color.decode("#ff642b"), Color.decode("#ffff7c"));
Color[] higherCol = ColorUtil.ColorPalette.getPalette(15, Color.decode("#ffff7c"), Color.GREEN);

Color[] colors = new Color[lowerCol.length + higherCol.length];
System.arraycopy(lowerCol, 0, colors, 0, lowerCol.length);
Expand All @@ -841,8 +841,8 @@ public BufferedImage toImage(int blockSize, HashingAlgorithm hashingAlgorithm) {
ensureUpToDateHash();

// Build color palette
Color[] lowerCol = ColorUtil.ColorPalette.getPalette(15, Color.web("#ff642b"), Color.web("#ffff7c"));
Color[] higherCol = ColorUtil.ColorPalette.getPalette(15, Color.web("#ffff7c"), Color.GREEN);
Color[] lowerCol = ColorUtil.ColorPalette.getPalette(15, Color.decode("#ff642b"), Color.decode("#ffff7c"));
Color[] higherCol = ColorUtil.ColorPalette.getPalette(15, Color.decode("#ffff7c"), Color.GREEN);

Color[] colors = new Color[lowerCol.length + higherCol.length];
System.arraycopy(lowerCol, 0, colors, 0, lowerCol.length);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/brachtendorf/jimagehash/hash/Hash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.brachtendorf.jimagehash.hash;

import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
Expand All @@ -14,7 +15,6 @@
import dev.brachtendorf.StringUtil;
import dev.brachtendorf.graphics.FastPixel;
import dev.brachtendorf.jimagehash.hashAlgorithms.HashingAlgorithm;
import javafx.scene.paint.Color;

/**
* Hashes are bit encoded encoded values (0101011101) created from images using
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/brachtendorf/jimagehash/hashAlgorithms/DifferenceHash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package dev.brachtendorf.jimagehash.hashAlgorithms;

import java.awt.*;
import java.awt.image.BufferedImage;
import java.math.BigInteger;
import java.util.Objects;


import dev.brachtendorf.graphics.FastPixel;
import dev.brachtendorf.jimagehash.hash.Hash;
import javafx.scene.paint.Color;

/**
* Calculates a hash based on gradient tracking. This hash is cheap to compute
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/brachtendorf/jimagehash/hashAlgorithms/HashingAlgorithm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ protected FastPixel createPixelAccessor(BufferedImage image, int width, int heig
*/
if (this.opaqueReplacementColor == null) {

javafx.scene.paint.Color interpolatedColor = ImageUtil.interpolateColor(image);
Color interpolatedColor = ImageUtil.interpolateColor(image);
Color replacementColor = ColorUtil.getContrastColor(ColorUtil.fxToAwtColor(interpolatedColor));
fp.setReplaceOpaqueColors(this.opaqueReplacementThreshold, replacementColor);
} else {
Expand Down