@@ -498,42 +498,42 @@ discard block |
||
498 | 498 | $datLen++; |
499 | 499 | |
500 | 500 | switch($b) { |
501 | - case 0x21: // Extension |
|
502 | - $len = 0; |
|
503 | - if(!$this->skipExt($data, $len)) { |
|
504 | - return false; |
|
505 | - } |
|
506 | - $datLen += $len; |
|
507 | - break; |
|
508 | - |
|
509 | - case 0x2C: // Image |
|
510 | - // LOAD HEADER & COLOR TABLE |
|
511 | - $len = 0; |
|
512 | - if(!$this->m_gih->load($data, $len)) { |
|
513 | - return false; |
|
514 | - } |
|
515 | - $data = substr($data, $len); |
|
516 | - $datLen += $len; |
|
517 | - |
|
518 | - // ALLOC BUFFER |
|
519 | - $len = 0; |
|
520 | - |
|
521 | - if(!($this->m_data = $this->m_lzw->deCompress($data, $len))) { |
|
522 | - return false; |
|
523 | - } |
|
524 | - |
|
525 | - $data = substr($data, $len); |
|
526 | - $datLen += $len; |
|
527 | - |
|
528 | - if($this->m_gih->m_bInterlace) { |
|
529 | - $this->deInterlace(); |
|
530 | - } |
|
531 | - |
|
532 | - return true; |
|
533 | - |
|
534 | - case 0x3B: // EOF |
|
535 | - default: |
|
536 | - return false; |
|
501 | + case 0x21: // Extension |
|
502 | + $len = 0; |
|
503 | + if(!$this->skipExt($data, $len)) { |
|
504 | + return false; |
|
505 | + } |
|
506 | + $datLen += $len; |
|
507 | + break; |
|
508 | + |
|
509 | + case 0x2C: // Image |
|
510 | + // LOAD HEADER & COLOR TABLE |
|
511 | + $len = 0; |
|
512 | + if(!$this->m_gih->load($data, $len)) { |
|
513 | + return false; |
|
514 | + } |
|
515 | + $data = substr($data, $len); |
|
516 | + $datLen += $len; |
|
517 | + |
|
518 | + // ALLOC BUFFER |
|
519 | + $len = 0; |
|
520 | + |
|
521 | + if(!($this->m_data = $this->m_lzw->deCompress($data, $len))) { |
|
522 | + return false; |
|
523 | + } |
|
524 | + |
|
525 | + $data = substr($data, $len); |
|
526 | + $datLen += $len; |
|
527 | + |
|
528 | + if($this->m_gih->m_bInterlace) { |
|
529 | + $this->deInterlace(); |
|
530 | + } |
|
531 | + |
|
532 | + return true; |
|
533 | + |
|
534 | + case 0x3B: // EOF |
|
535 | + default: |
|
536 | + return false; |
|
537 | 537 | } |
538 | 538 | } |
539 | 539 | return false; |
@@ -550,24 +550,24 @@ discard block |
||
550 | 550 | $extLen++; |
551 | 551 | |
552 | 552 | switch($b) { |
553 | - case 0xF9: // Graphic Control |
|
554 | - $b = ord($data[1]); |
|
555 | - $this->m_disp = ($b & 0x1C) >> 2; |
|
556 | - $this->m_bUser = ($b & 0x02) ? true : false; |
|
557 | - $this->m_bTrans = ($b & 0x01) ? true : false; |
|
558 | - $this->m_nDelay = $this->w2i(substr($data, 2, 2)); |
|
559 | - $this->m_nTrans = ord($data[4]); |
|
560 | - break; |
|
561 | - |
|
562 | - case 0xFE: // Comment |
|
563 | - $this->m_lpComm = substr($data, 1, ord($data[0])); |
|
564 | - break; |
|
565 | - |
|
566 | - case 0x01: // Plain text |
|
567 | - break; |
|
568 | - |
|
569 | - case 0xFF: // Application |
|
570 | - break; |
|
553 | + case 0xF9: // Graphic Control |
|
554 | + $b = ord($data[1]); |
|
555 | + $this->m_disp = ($b & 0x1C) >> 2; |
|
556 | + $this->m_bUser = ($b & 0x02) ? true : false; |
|
557 | + $this->m_bTrans = ($b & 0x01) ? true : false; |
|
558 | + $this->m_nDelay = $this->w2i(substr($data, 2, 2)); |
|
559 | + $this->m_nTrans = ord($data[4]); |
|
560 | + break; |
|
561 | + |
|
562 | + case 0xFE: // Comment |
|
563 | + $this->m_lpComm = substr($data, 1, ord($data[0])); |
|
564 | + break; |
|
565 | + |
|
566 | + case 0x01: // Plain text |
|
567 | + break; |
|
568 | + |
|
569 | + case 0xFF: // Application |
|
570 | + break; |
|
571 | 571 | } |
572 | 572 | |
573 | 573 | // SKIP DEFAULT AS DEFS MAY CHANGE |
@@ -599,25 +599,25 @@ discard block |
||
599 | 599 | |
600 | 600 | for($i = 0; $i < 4; $i++) { |
601 | 601 | switch($i) { |
602 | - case 0: |
|
603 | - $s = 8; |
|
604 | - $y = 0; |
|
605 | - break; |
|
606 | - |
|
607 | - case 1: |
|
608 | - $s = 8; |
|
609 | - $y = 4; |
|
610 | - break; |
|
611 | - |
|
612 | - case 2: |
|
613 | - $s = 4; |
|
614 | - $y = 2; |
|
615 | - break; |
|
616 | - |
|
617 | - case 3: |
|
618 | - $s = 2; |
|
619 | - $y = 1; |
|
620 | - break; |
|
602 | + case 0: |
|
603 | + $s = 8; |
|
604 | + $y = 0; |
|
605 | + break; |
|
606 | + |
|
607 | + case 1: |
|
608 | + $s = 8; |
|
609 | + $y = 4; |
|
610 | + break; |
|
611 | + |
|
612 | + case 2: |
|
613 | + $s = 4; |
|
614 | + $y = 2; |
|
615 | + break; |
|
616 | + |
|
617 | + case 3: |
|
618 | + $s = 2; |
|
619 | + $y = 1; |
|
620 | + break; |
|
621 | 621 | } |
622 | 622 | |
623 | 623 | for(; $y < $this->m_gih->m_nHeight; $y += $s) { |