diff --git a/ofdgo_editor_color.go b/ofdgo_editor_color.go index f9654ee..f5301d0 100644 --- a/ofdgo_editor_color.go +++ b/ofdgo_editor_color.go @@ -233,7 +233,7 @@ func (e *Editor) Color(value *FillColor) (color.NRGBA, error) { found, _ = resourceValue(e.source.reader.colorSpaceCache, id) } for _, resource := range e.resources { - if resource.space != nil && resource.space.ID == id { + if resource.space != nil && sameResourceID(resource.space.ID, id) { found = resource.space break } diff --git a/ofdgo_editor_media.go b/ofdgo_editor_media.go index a4b053a..6922056 100644 --- a/ofdgo_editor_media.go +++ b/ofdgo_editor_media.go @@ -55,7 +55,7 @@ func (e *Editor) AddMedia(kind, format string, data []byte) (string, error) { func (e *Editor) CopyMedia(id string) (string, error) { var copy editorResource for _, resource := range e.resources { - if resource.image != nil && resource.image.ID == id { + if resource.image != nil && sameResourceID(resource.image.ID, id) { copy = resource break } diff --git a/ofdgo_editor_open.go b/ofdgo_editor_open.go index a0d1bc5..ea309ba 100644 --- a/ofdgo_editor_open.go +++ b/ofdgo_editor_open.go @@ -349,7 +349,7 @@ func (e *Editor) sourceRGB() bool { if e.source == nil || e.source.document.CommonData.DefaultCS == 0 { return true } - space := e.source.reader.colorSpaceCache[strconv.Itoa(e.source.document.CommonData.DefaultCS)] + space, _ := resourceValue(e.source.reader.colorSpaceCache, strconv.Itoa(e.source.document.CommonData.DefaultCS)) return space != nil && space.Type == "RGB" && space.Profile == "" && (space.BitsPerComponent == 0 || space.BitsPerComponent == 8) && len(space.Palette) == 0 }