@@ -1170,11 +1170,6 @@ function encodeNameless(enc, m, firstcode, extraDigits) {
11701170 var SIDE = smartdiv ( m ) ;
11711171 var orgSIDE = SIDE ;
11721172 var xSIDE = SIDE ;
1173- if ( isSpecialShape ( m ) ) {
1174- xSIDE *= SIDE ;
1175- SIDE = 1 + Math . floor ( ( mm . maxy - mm . miny ) / 90 ) ;
1176- xSIDE = Math . floor ( xSIDE / SIDE ) ;
1177- }
11781173
11791174 var dividerx4 = xDivider4 ( mm . miny , mm . maxy ) ; // note that xDivider4 is 4 times too large
11801175 var xFracture = Math . floor ( enc . fraclon / 810000 ) ;
@@ -1192,6 +1187,9 @@ function encodeNameless(enc, m, firstcode, extraDigits) {
11921187
11931188 var v = storage_offset ;
11941189 if ( isSpecialShape ( m ) ) {
1190+ xSIDE *= SIDE ;
1191+ SIDE = 1 + Math . floor ( ( mm . maxy - mm . miny ) / 90 ) ;
1192+ xSIDE = Math . floor ( xSIDE / SIDE ) ;
11951193 v += encodeSixWide ( dx , SIDE - 1 - dy , xSIDE , SIDE ) ;
11961194 }
11971195 else {
@@ -1318,14 +1316,12 @@ function decodeNameless(input, extensionchars, m, firstindex) {
13181316 SIDE = smartdiv ( m ) ;
13191317 var xSIDE = SIDE ;
13201318
1319+ var dx , dy ;
13211320 if ( isSpecialShape ( m ) ) {
13221321 xSIDE *= SIDE ;
13231322 SIDE = 1 + Math . floor ( ( mm . maxy - mm . miny ) / 90 ) ;
13241323 xSIDE = Math . floor ( xSIDE / SIDE ) ;
1325- }
1326-
1327- var dx , dy ;
1328- if ( isSpecialShape ( m ) ) {
1324+
13291325 var d = decodeSixWide ( v , xSIDE , SIDE ) ;
13301326 dx = d . x ;
13311327 dy = SIDE - 1 - d . y ;
@@ -1464,8 +1460,8 @@ function decodeAutoHeader(input, extensionchars, m) {
14641460 var vx = triple . x + 168 * Math . floor ( value / Math . floor ( H / 176 ) ) ;
14651461 var vy = triple . y + 176 * ( value % Math . floor ( H / 176 ) ) ;
14661462
1467- var cornery = mm . maxy - vy * dividery ;
1468- var cornerx = mm . minx + vx * dividerx ;
1463+ var cornery = mm . maxy - ( vy * dividery ) ;
1464+ var cornerx = mm . minx + ( vx * dividerx ) ;
14691465 if ( cornerx < mm . minx || cornerx >= mm . maxx || cornery < mm . miny || cornery > mm . maxy ) {
14701466 return false ;
14711467 }
0 commit comments