Mercurial > octave

comparison libinterp/dldfcn/__magick_read__.cc @ 21567:3d25f9f4a62b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Eliminate Britishicisms in the code. * oct-stream.cc, __magick_read__.cc, Array.h, flag.m, lines.m, prism.m, __contour__.m: Use 'optimize' and 'color' rather than British spellings.
author Rik <rik@octave.org>
date Wed, 30 Mar 2016 21:35:51 -0700
parents ea81c2fdd568
children 3d60ed163b70
comparison
equal deleted inserted replaced
21566:02826fb0f261 21567:3d25f9f4a62b
437 // values not being handled in switch. 437 // values not being handled in switch.
438 ; 438 ;
439 } 439 }
440 } 440 }
441 441
442 const octave_idx_type colour_stride = nRows * nCols; 442 const octave_idx_type color_stride = nRows * nCols;
443 switch (type) 443 switch (type)
444 { 444 {
445 case Magick::BilevelType: // Monochrome bi-level image 445 case Magick::BilevelType: // Monochrome bi-level image
446 case Magick::GrayscaleType: // Grayscale image 446 case Magick::GrayscaleType: // Grayscale image
447 { 447 {
504 case Magick::TrueColorType: // Truecolor image 504 case Magick::TrueColorType: // Truecolor image
505 { 505 {
506 img = T (dim_vector (nRows, nCols, 3, nFrames)); 506 img = T (dim_vector (nRows, nCols, 3, nFrames));
507 P *img_fvec = img.fortran_vec (); 507 P *img_fvec = img.fortran_vec ();
508 508
509 const octave_idx_type frame_stride = colour_stride * 3; 509 const octave_idx_type frame_stride = color_stride * 3;
510 for (octave_idx_type frame = 0; frame < nFrames; frame++) 510 for (octave_idx_type frame = 0; frame < nFrames; frame++)
511 { 511 {
512 OCTAVE_QUIT; 512 OCTAVE_QUIT;
513 const Magick::PixelPacket *pix 513 const Magick::PixelPacket *pix
514 = imvec[frameidx(frame)].getConstPixels (col_start, row_start, 514 = imvec[frameidx(frame)].getConstPixels (col_start, row_start,
515 col_cache, row_cache); 515 col_cache, row_cache);
516 516
517 octave_idx_type idx = 0; 517 octave_idx_type idx = 0;
518 P *rbuf = img_fvec; 518 P *rbuf = img_fvec;
519 P *gbuf = img_fvec + colour_stride; 519 P *gbuf = img_fvec + color_stride;
520 P *bbuf = img_fvec + colour_stride * 2; 520 P *bbuf = img_fvec + color_stride * 2;
521 521
522 for (octave_idx_type col = 0; col < nCols; col++) 522 for (octave_idx_type col = 0; col < nCols; col++)
523 { 523 {
524 for (octave_idx_type row = 0; row < nRows; row++) 524 for (octave_idx_type row = 0; row < nRows; row++)
525 { 525 {
542 img = T (dim_vector (nRows, nCols, 3, nFrames)); 542 img = T (dim_vector (nRows, nCols, 3, nFrames));
543 T alpha (dim_vector (nRows, nCols, 1, nFrames)); 543 T alpha (dim_vector (nRows, nCols, 1, nFrames));
544 P *img_fvec = img.fortran_vec (); 544 P *img_fvec = img.fortran_vec ();
545 P *a_fvec = alpha.fortran_vec (); 545 P *a_fvec = alpha.fortran_vec ();
546 546
547 const octave_idx_type frame_stride = colour_stride * 3; 547 const octave_idx_type frame_stride = color_stride * 3;
548 548
549 // Unlike the index for the other channels, this one won't need 549 // Unlike the index for the other channels, this one won't need
550 // to be reset on each frame since it's a separate matrix. 550 // to be reset on each frame since it's a separate matrix.
551 octave_idx_type a_idx = 0; 551 octave_idx_type a_idx = 0;
552 for (octave_idx_type frame = 0; frame < nFrames; frame++) 552 for (octave_idx_type frame = 0; frame < nFrames; frame++)
556 = imvec[frameidx(frame)].getConstPixels (col_start, row_start, 556 = imvec[frameidx(frame)].getConstPixels (col_start, row_start,
557 col_cache, row_cache); 557 col_cache, row_cache);
558 558
559 octave_idx_type idx = 0; 559 octave_idx_type idx = 0;
560 P *rbuf = img_fvec; 560 P *rbuf = img_fvec;
561 P *gbuf = img_fvec + colour_stride; 561 P *gbuf = img_fvec + color_stride;
562 P *bbuf = img_fvec + colour_stride * 2; 562 P *bbuf = img_fvec + color_stride * 2;
563 563
564 for (octave_idx_type col = 0; col < nCols; col++) 564 for (octave_idx_type col = 0; col < nCols; col++)
565 { 565 {
566 for (octave_idx_type row = 0; row < nRows; row++) 566 for (octave_idx_type row = 0; row < nRows; row++)
567 { 567 {
583 case Magick::ColorSeparationType: // Cyan/Magenta/Yellow/Black (CMYK) image 583 case Magick::ColorSeparationType: // Cyan/Magenta/Yellow/Black (CMYK) image
584 { 584 {
585 img = T (dim_vector (nRows, nCols, 4, nFrames)); 585 img = T (dim_vector (nRows, nCols, 4, nFrames));
586 P *img_fvec = img.fortran_vec (); 586 P *img_fvec = img.fortran_vec ();
587 587
588 const octave_idx_type frame_stride = colour_stride * 4; 588 const octave_idx_type frame_stride = color_stride * 4;
589 for (octave_idx_type frame = 0; frame < nFrames; frame++) 589 for (octave_idx_type frame = 0; frame < nFrames; frame++)
590 { 590 {
591 OCTAVE_QUIT; 591 OCTAVE_QUIT;
592 const Magick::PixelPacket *pix 592 const Magick::PixelPacket *pix
593 = imvec[frameidx(frame)].getConstPixels (col_start, row_start, 593 = imvec[frameidx(frame)].getConstPixels (col_start, row_start,
594 col_cache, row_cache); 594 col_cache, row_cache);
595 595
596 octave_idx_type idx = 0; 596 octave_idx_type idx = 0;
597 P *cbuf = img_fvec; 597 P *cbuf = img_fvec;
598 P *mbuf = img_fvec + colour_stride; 598 P *mbuf = img_fvec + color_stride;
599 P *ybuf = img_fvec + colour_stride * 2; 599 P *ybuf = img_fvec + color_stride * 2;
600 P *kbuf = img_fvec + colour_stride * 3; 600 P *kbuf = img_fvec + color_stride * 3;
601 601
602 for (octave_idx_type col = 0; col < nCols; col++) 602 for (octave_idx_type col = 0; col < nCols; col++)
603 { 603 {
604 for (octave_idx_type row = 0; row < nRows; row++) 604 for (octave_idx_type row = 0; row < nRows; row++)
605 { 605 {
623 img = T (dim_vector (nRows, nCols, 4, nFrames)); 623 img = T (dim_vector (nRows, nCols, 4, nFrames));
624 T alpha (dim_vector (nRows, nCols, 1, nFrames)); 624 T alpha (dim_vector (nRows, nCols, 1, nFrames));
625 P *img_fvec = img.fortran_vec (); 625 P *img_fvec = img.fortran_vec ();
626 P *a_fvec = alpha.fortran_vec (); 626 P *a_fvec = alpha.fortran_vec ();
627 627
628 const octave_idx_type frame_stride = colour_stride * 4; 628 const octave_idx_type frame_stride = color_stride * 4;
629 629
630 // Unlike the index for the other channels, this one won't need 630 // Unlike the index for the other channels, this one won't need
631 // to be reset on each frame since it's a separate matrix. 631 // to be reset on each frame since it's a separate matrix.
632 octave_idx_type a_idx = 0; 632 octave_idx_type a_idx = 0;
633 for (octave_idx_type frame = 0; frame < nFrames; frame++) 633 for (octave_idx_type frame = 0; frame < nFrames; frame++)
641 const Magick::IndexPacket *apix 641 const Magick::IndexPacket *apix
642 = imvec[frameidx(frame)].getConstIndexes (); 642 = imvec[frameidx(frame)].getConstIndexes ();
643 643
644 octave_idx_type idx = 0; 644 octave_idx_type idx = 0;
645 P *cbuf = img_fvec; 645 P *cbuf = img_fvec;
646 P *mbuf = img_fvec + colour_stride; 646 P *mbuf = img_fvec + color_stride;
647 P *ybuf = img_fvec + colour_stride * 2; 647 P *ybuf = img_fvec + color_stride * 2;
648 P *kbuf = img_fvec + colour_stride * 3; 648 P *kbuf = img_fvec + color_stride * 3;
649 649
650 for (octave_idx_type col = 0; col < nCols; col++) 650 for (octave_idx_type col = 0; col < nCols; col++)
651 { 651 {
652 for (octave_idx_type row = 0; row < nRows; row++) 652 for (octave_idx_type row = 0; row < nRows; row++)
653 { 653 {
1399 const std::string filename = args(0).string_value (); 1399 const std::string filename = args(0).string_value ();
1400 const std::string ext = args(1).string_value (); 1400 const std::string ext = args(1).string_value ();
1401 1401
1402 const octave_scalar_map options = args(4).xscalar_map_value ("__magick_write__: OPTIONS must be a struct"); 1402 const octave_scalar_map options = args(4).xscalar_map_value ("__magick_write__: OPTIONS must be a struct");
1403 1403
1404 const octave_value img = args(2); 1404 const octave_value img = args(2);
1405 const Matrix cmap = args(3).xmatrix_value ("__magick_write__: invalid MAP"); 1405 const Matrix cmap = args(3).xmatrix_value ("__magick_write__: invalid MAP");
1406 1406
1407 std::vector<Magick::Image> imvec; 1407 std::vector<Magick::Image> imvec;
1408 1408
1409 if (cmap.is_empty ()) 1409 if (cmap.is_empty ())