Skip to content

Fix compile issues #9

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix compile issues #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfa0269
fix: Edit podspec and update SwiftPriorityQueue version
terminox Nov 8, 2020
bf98fde
fix(PaletteSwatch): Change access control from open to public
terminox Nov 8, 2020
6159471
Merge pull request #1 from terminox/fix
terminox Nov 8, 2020
7f99f8e
fix: Update podspec
terminox Nov 9, 2020
cd5d0ca
fix(RGBColor): Fix complex expression error when compile for simulators
terminox Nov 27, 2020
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
2 changes: 1 addition & 1 deletion ImagePalette.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Pod::Spec.new do |s|
s.source_files = "src/*.swift"
s.requires_arc = true

s.dependency 'SwiftPriorityQueue', '~> 1.1.2'
s.dependency 'SwiftPriorityQueue', '~> 1.3.1'
end
4 changes: 2 additions & 2 deletions src/PaletteSwatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ open class PaletteSwatch {
private let hex: Int64

/** This swatch’s color */
open let color: UIColor
public let color: UIColor

/** The number of pixels represented by this swatch */
open let population: Int64
public let population: Int64

private var generatedTextColors: Bool = false
private var _titleTextColor: UIColor?
Expand Down
5 changes: 3 additions & 2 deletions src/RGBColor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ internal struct RGBColor: Hashable, Equatable {
self.green = green
self.blue = blue
self.alpha = alpha
let maxInt = Int64(Int32.max)
self.hashValue = Int(((alpha << 24) | (red << 16) | (green << 8) | blue) % maxInt)
let maxInt = Int64(Int32.max)
let base = ((alpha << 24) | (red << 16) | (green << 8) | blue)
self.hashValue = Int(base % maxInt)
}

init(color: UIColor) {
Expand Down