Extract images with position in package extractor (v3) #330
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## v3 #330 +/- ##
=========================================
+ Coverage 51.34% 57.34% +6%
=========================================
Files 144 145 +1
Lines 25098 25208 +110
=========================================
+ Hits 12886 14456 +1570
+ Misses 10488 10389 -99
+ Partials 1724 363 -1361
Continue to review full report at Codecov.
|
…idoc/unidoc into v3-extract-images-with-position
gunnsth
changed the title
adrg
reviewed
Jan 29, 2019
pdf/extractor/image.go
Outdated
| return ctx.processOperand(op, gs, resources) | ||
| }) | ||
|
|
||
| err = processor.Process(resources) |
There was a problem hiding this comment.
Can just return the result of the Process method:
return processor.Process(resources)
pdf/extractor/image.go
Outdated
| func (ctx *imageExtractContext) processOperand(op *contentstream.ContentStreamOperation, gs contentstream.GraphicsState, resources *model.PdfPageResources) error { | ||
| if op.Operand == "BI" && len(op.Params) == 1 { | ||
| // BI: Inline image. | ||
|
|
There was a problem hiding this comment.
Remove unnecessary empty line
pdf/extractor/image.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| xDim := gs.CTM.ScalingFactorX() |
There was a problem hiding this comment.
Unnecessary variables. Maybe assign directly to struct:
imgMark := ImageMark{
Image: &rgbImg,
Width: gs.CTM.ScalingFactorX(),
Height: gs.CTM.ScalingFactorY(),
Angle: gs.CTM.Angle(),
}
imgMark.X, imgMark.Y = gs.CTM.Translation()
pdf/extractor/image.go
Outdated
|
|
||
| _, xtype := resources.GetXObjectByName(*name) | ||
| if xtype == model.XObjectTypeImage { | ||
| common.Log.Debug(" XObject Image: %s", *name) |
There was a problem hiding this comment.
Remove space at the beginning of the " XObject Image: %s" string
pdf/extractor/image.go
Outdated
| } | ||
| ctx.cacheXObjectImages[stream] = cimg | ||
| } | ||
| img := cimg.image |
There was a problem hiding this comment.
Unnecessary variables. Maybe use directly:
rgbImg, err := cimg.cs.ImageToRGB(*cimg.image)
if err != nil {
return err
}
common.Log.Debug("@Do CTM: %s", gs.CTM.String())
imgMark := ImageMark{
Image: &rgbImg,
Width: gs.CTM.ScalingFactorX(),
Height: gs.CTM.ScalingFactorY(),
Angle: gs.CTM.Angle(),
}
imgMark.X, imgMark.Y = gs.CTM.Translation()
pdf/extractor/image.go
Outdated
| return nil, err | ||
| } | ||
|
|
||
| images := &PageImages{ |
There was a problem hiding this comment.
Maybe return directly:
return &PageImages{
Images: ctx.extractedImages,
}, nil
pdf/extractor/image.go
Outdated
| cs model.PdfColorspace | ||
| } | ||
|
|
||
| func (ctx *imageExtractContext) extractImagesInContentStream(contents string, resources *model.PdfPageResources) error { |
There was a problem hiding this comment.
This method could be named extractContentStreamImages instead of extractImagesInContentStream.
| } | ||
|
|
||
| // Process individual content stream operands for image extraction. | ||
| func (ctx *imageExtractContext) processOperand(op *contentstream.ContentStreamOperation, gs contentstream.GraphicsState, resources *model.PdfPageResources) error { |
There was a problem hiding this comment.
This method seems too long to me. May be better to split it in separate methods. Something like:
func (ctx *imageExtractContext) processOperand(op *contentstream.ContentStreamOperation, gs contentstream.GraphicsState, resources *model.PdfPageResources) error {
lenParams := len(op.Params)
if op.Operand == "BI" && lenParams == 1 {
iimg, ok := op.Params[0].(*contentstream.ContentStreamInlineImage)
if !ok {
return nil
}
return ctx.extractInlineImage(iimg, gs, resources)
} else if op.Operand == "Do" && lenParams == 1 {
name, ok := core.GetName(op.Params[0])
if !ok {
return errTypeCheck
}
_, xtype := resources.GetXObjectByName(*name)
if xtype == model.XObjectTypeImage {
return ctx.extractXObjectImage(name, gs, resources)
} else if xtype == model.XObjectTypeForm {
return ctx.extractFormImages(name, gs, resources)
}
}
return nil
}
|
@adrg Thanks. I have addressed the comments, please take a look. |
|
@gunnsth All review points resolved. Looks good. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Image extraction support in extractor package. Can extract image data with coordinate information (position and dimensions). Implements #317.