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.

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

Keep track of the character to glyph mapping in font_renderer.js, to prevent errors when different characters point to the same glyph (issue 7101) #7106

Merged
merged 1 commit into from
Apr 1, 2016

Conversation

Snuffleupagus
Copy link
Collaborator

I've not yet had time to create a reduced test-case, and I'm not sure if we'll be able to test this using only an appropriate text rendering mode (i.e. 4 - 7), or if disableFontFace = true is actually necessary.

Fixes #7101.

@@ -656,7 +669,8 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
this.glyphs = glyphs;
this.cmap = cmap;

this.compiledGlyphs = [];
this.compiledGlyphs = Object.create(null);
this.compiledCharCodeToGlyphId = Object.create(null);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking through this once more, I'm assuming that these two lines could actually be removed given the CompiledFont.call(this, fontMatrix); line above?

@Snuffleupagus
Copy link
Collaborator Author

/botio-windows preview

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_preview from @Snuffleupagus received. Current queue size: 0

Live output at: http://107.22.172.223:8877/c0ca6065a2d6ec0/output.txt

@Snuffleupagus
Copy link
Collaborator Author

/botio test

@pdfjsbot
Copy link

From: Bot.io (Linux)


Received

Command cmd_test from @Snuffleupagus received. Current queue size: 0

Live output at: http://107.21.233.14:8877/a745235285f9013/output.txt

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_test from @Snuffleupagus received. Current queue size: 0

Live output at: http://107.22.172.223:8877/584893c23c1017c/output.txt

@pdfjsbot
Copy link

From: Bot.io (Windows)


Success

Full output at http://107.22.172.223:8877/584893c23c1017c/output.txt

Total script time: 20.39 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

@pdfjsbot
Copy link

From: Bot.io (Linux)


Success

Full output at http://107.21.233.14:8877/a745235285f9013/output.txt

Total script time: 22.08 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

…prevent errors when different characters point to the same glyph (issue 7101)

Fixes 7101.
@Snuffleupagus
Copy link
Collaborator Author

Updated to fix a merge conflict in test/pdfs/.gitignore.

@yurydelendik
Copy link
Contributor

Looks good. Thank you for the patch.

/botio makeref

@pdfjsbot
Copy link

pdfjsbot commented Apr 1, 2016

From: Bot.io (Linux)


Received

Command cmd_makeref from @yurydelendik received. Current queue size: 0

Live output at: http://107.21.233.14:8877/2d18ddc2766507d/output.txt

@pdfjsbot
Copy link

pdfjsbot commented Apr 1, 2016

From: Bot.io (Windows)


Received

Command cmd_makeref from @yurydelendik received. Current queue size: 0

Live output at: http://107.22.172.223:8877/0abcafa947dd73b/output.txt

@yurydelendik yurydelendik merged commit ff3ce97 into mozilla:master Apr 1, 2016
@pdfjsbot
Copy link

pdfjsbot commented Apr 1, 2016

From: Bot.io (Windows)


Success

Full output at http://107.22.172.223:8877/0abcafa947dd73b/output.txt

Total script time: 20.13 mins

  • Lint: Passed
  • Make references: Passed
  • Check references: Passed

@pdfjsbot
Copy link

pdfjsbot commented Apr 1, 2016

From: Bot.io (Linux)


Success

Full output at http://107.21.233.14:8877/2d18ddc2766507d/output.txt

Total script time: 21.39 mins

  • Lint: Passed
  • Make references: Passed
  • Check references: Passed

@Snuffleupagus Snuffleupagus deleted the issue-7101 branch April 1, 2016 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants