Changeset 3079 for libpipi/trunk
- Timestamp:
- Oct 24, 2008, 12:20:07 AM (12 years ago)
- Location:
- libpipi/trunk/pipi-php
- Files:
-
- 1 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libpipi/trunk/pipi-php/php_pipi.c
r3069 r3079 193 193 194 194 PHP_FUNCTION(pipi_get_command_list) { 195 pipi_command_t const *list; 196 pipi_command_t const *cmd; 197 list = pipi_get_command_list(); 198 199 array_init(return_value); 200 for (cmd = list; cmd->name; cmd++) 201 add_assoc_long(return_value, (char*) cmd->name, cmd->argc); 195 202 } 196 203 … … 215 222 216 223 PHP_FUNCTION(pipi_new) { 217 long width = 0; 218 long height = 0; 224 long width, height = 0; 219 225 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &width, &height) == FAILURE) { 220 226 RETURN_FALSE; … … 287 293 288 294 PHP_FUNCTION(pipi_measure_msd) { 289 pipi_image_t *img1; 290 pipi_image_t *img2; 295 pipi_image_t *img1, *img2; 291 296 FETCH_IMG_IMG(img1, img2); 292 297 RETURN_LONG(pipi_measure_msd(img1, img2)); … … 294 299 295 300 PHP_FUNCTION(pipi_measure_rmsd) { 296 pipi_image_t *img1; 297 pipi_image_t *img2; 301 pipi_image_t *img1, *img2; 298 302 FETCH_IMG_IMG(img1, img2); 299 303 RETURN_LONG(pipi_measure_rmsd(img1, img2)); … … 302 306 PHP_FUNCTION(pipi_resize) { 303 307 zval *_zval; 304 long width = 0; 305 long height = 0; 308 long width, height = 0; 306 309 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &_zval, &width, &height) == FAILURE) { 307 310 RETURN_FALSE; … … 316 319 317 320 PHP_FUNCTION(pipi_render_random) { 318 long width = 0; 319 long height = 0; 321 long width, height = 0; 320 322 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &width, &height) == FAILURE) { 321 323 RETURN_FALSE; … … 327 329 328 330 PHP_FUNCTION(pipi_render_bayer) { 329 long width = 0; 330 long height = 0; 331 long width, height = 0; 331 332 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &width, &height) == FAILURE) { 332 333 RETURN_FALSE; … … 338 339 339 340 PHP_FUNCTION(pipi_render_halftone) { 340 long width = 0; 341 long height = 0; 341 long width, height = 0; 342 342 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &width, &height) == FAILURE) { 343 343 RETURN_FALSE; … … 349 349 350 350 PHP_FUNCTION(pipi_rgb) { 351 zval *_zval1; 352 zval *_zval2; 353 zval *_zval3; 351 zval *_zval1, *_zval2, *_zval3; 354 352 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrr", &_zval1, &_zval2, &_zval3) == FAILURE) { 355 353 RETURN_FALSE; 356 354 } 357 355 358 pipi_image_t *img_r; 359 pipi_image_t *img_g; 360 pipi_image_t *img_b; 361 356 pipi_image_t *img_r, *img_g, *img_b; 362 357 ZEND_FETCH_RESOURCE(img_r, pipi_image_t*, &_zval1, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 363 358 ZEND_FETCH_RESOURCE(img_g, pipi_image_t*, &_zval2, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); … … 394 389 395 390 PHP_FUNCTION(pipi_mean) { 396 pipi_image_t *img1; 397 pipi_image_t *img2; 391 pipi_image_t *img1, *img2; 398 392 FETCH_IMG_IMG(img1, img2); 399 393 pipi_image_t *result; … … 403 397 404 398 PHP_FUNCTION(pipi_min) { 405 pipi_image_t *img1; 406 pipi_image_t *img2; 399 pipi_image_t *img1, *img2; 407 400 FETCH_IMG_IMG(img1, img2); 408 401 pipi_image_t *result; … … 412 405 413 406 PHP_FUNCTION(pipi_max) { 414 pipi_image_t *img1; 415 pipi_image_t *img2; 407 pipi_image_t *img1, *img2; 416 408 FETCH_IMG_IMG(img1, img2); 417 409 pipi_image_t *result; … … 421 413 422 414 PHP_FUNCTION(pipi_add) { 423 pipi_image_t *img1; 424 pipi_image_t *img2; 415 pipi_image_t *img1, *img2; 425 416 FETCH_IMG_IMG(img1, img2); 426 417 pipi_image_t *result; … … 430 421 431 422 PHP_FUNCTION(pipi_sub) { 432 pipi_image_t *img1; 433 pipi_image_t *img2; 423 pipi_image_t *img1, *img2; 434 424 FETCH_IMG_IMG(img1, img2); 435 425 pipi_image_t *result; … … 439 429 440 430 PHP_FUNCTION(pipi_difference) { 441 pipi_image_t *img1; 442 pipi_image_t *img2; 431 pipi_image_t *img1, *img2; 443 432 FETCH_IMG_IMG(img1, img2); 444 433 pipi_image_t *result; … … 448 437 449 438 PHP_FUNCTION(pipi_multiply) { 450 pipi_image_t *img1; 451 pipi_image_t *img2; 439 pipi_image_t *img1, *img2; 452 440 FETCH_IMG_IMG(img1, img2); 453 441 pipi_image_t *result; … … 457 445 458 446 PHP_FUNCTION(pipi_divide) { 459 pipi_image_t *img1; 460 pipi_image_t *img2; 447 pipi_image_t *img1, *img2; 461 448 FETCH_IMG_IMG(img1, img2); 462 449 pipi_image_t *result; … … 466 453 467 454 PHP_FUNCTION(pipi_screen) { 468 pipi_image_t *img1; 469 pipi_image_t *img2; 455 pipi_image_t *img1, *img2; 470 456 FETCH_IMG_IMG(img1, img2); 471 457 pipi_image_t *result; … … 475 461 476 462 PHP_FUNCTION(pipi_overlay) { 477 pipi_image_t *img1; 478 pipi_image_t *img2; 463 pipi_image_t *img1, *img2; 479 464 FETCH_IMG_IMG(img1, img2); 480 465 pipi_image_t *result; … … 487 472 488 473 PHP_FUNCTION(pipi_gaussian_blur) { 474 zval *_zval; 475 double value = 0; 476 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rd", &_zval, &value) == FAILURE) { 477 RETURN_FALSE; 478 } 479 pipi_image_t *src; 480 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 481 482 pipi_image_t *result; 483 result = pipi_gaussian_blur(src, value); 484 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 489 485 } 490 486 491 487 PHP_FUNCTION(pipi_gaussian_blur_ext) { 488 zval *_zval; 489 double v1, v2, v3, v4, v5 = 0; 490 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rddddd", &_zval, &v1, &v2, &v3, &v4, &v5) == FAILURE) { 491 RETURN_FALSE; 492 } 493 pipi_image_t *src; 494 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 495 496 pipi_image_t *result; 497 result = pipi_gaussian_blur_ext(src, v1, v2, v3, v4, v5); 498 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 492 499 } 493 500 494 501 PHP_FUNCTION(pipi_box_blur) { 495 }496 497 PHP_FUNCTION(pipi_box_blur_ext) {498 }499 500 PHP_FUNCTION(pipi_brightness) {501 502 zval *_zval; 502 503 long value = 0; … … 508 509 509 510 pipi_image_t *result; 511 result = pipi_box_blur(src, value); 512 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 513 } 514 515 PHP_FUNCTION(pipi_box_blur_ext) { 516 zval *_zval; 517 long m, n = 0; 518 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &_zval, &m, &n) == FAILURE) { 519 RETURN_FALSE; 520 } 521 pipi_image_t *src; 522 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 523 524 pipi_image_t *result; 525 result = pipi_box_blur_ext(src, m, n); 526 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 527 } 528 529 PHP_FUNCTION(pipi_brightness) { 530 zval *_zval; 531 double value = 0; 532 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rd", &_zval, &value) == FAILURE) { 533 RETURN_FALSE; 534 } 535 pipi_image_t *src; 536 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 537 538 pipi_image_t *result; 510 539 result = pipi_brightness(src, value); 511 540 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); … … 513 542 514 543 PHP_FUNCTION(pipi_contrast) { 544 zval *_zval; 545 double value = 0; 546 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rd", &_zval, &value) == FAILURE) { 547 RETURN_FALSE; 548 } 549 pipi_image_t *src; 550 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 551 552 pipi_image_t *result; 553 result = pipi_contrast(src, value); 554 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 555 } 556 557 PHP_FUNCTION(pipi_autocontrast) { 558 pipi_image_t *src; 559 FETCH_IMG(src); 560 pipi_image_t *result; 561 result = pipi_autocontrast(src); 562 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 563 } 564 565 PHP_FUNCTION(pipi_invert) { 566 pipi_image_t *src; 567 FETCH_IMG(src); 568 pipi_image_t *result; 569 result = pipi_invert(src); 570 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 571 } 572 573 PHP_FUNCTION(pipi_threshold) { 574 zval *_zval; 575 double value = 0; 576 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rd", &_zval, &value) == FAILURE) { 577 RETURN_FALSE; 578 } 579 pipi_image_t *src; 580 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 581 582 pipi_image_t *result; 583 result = pipi_threshold(src, value); 584 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 585 } 586 587 PHP_FUNCTION(pipi_hflip) { 588 pipi_image_t *src; 589 FETCH_IMG(src); 590 pipi_image_t *result; 591 result = pipi_hflip(src); 592 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 593 } 594 595 PHP_FUNCTION(pipi_vflip) { 596 pipi_image_t *src; 597 FETCH_IMG(src); 598 pipi_image_t *result; 599 result = pipi_vflip(src); 600 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 601 } 602 603 PHP_FUNCTION(pipi_rotate90) { 604 pipi_image_t *src; 605 FETCH_IMG(src); 606 pipi_image_t *result; 607 result = pipi_rotate90(src); 608 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 609 } 610 611 PHP_FUNCTION(pipi_rotate180) { 612 pipi_image_t *src; 613 FETCH_IMG(src); 614 pipi_image_t *result; 615 result = pipi_rotate180(src); 616 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 617 } 618 619 PHP_FUNCTION(pipi_rotate270) { 620 pipi_image_t *src; 621 FETCH_IMG(src); 622 pipi_image_t *result; 623 result = pipi_rotate270(src); 624 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 625 } 626 627 PHP_FUNCTION(pipi_median) { 515 628 zval *_zval; 516 629 long value = 0; … … 522 635 523 636 pipi_image_t *result; 524 result = pipi_contrast(src, value); 525 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 526 } 527 528 PHP_FUNCTION(pipi_autocontrast) { 529 pipi_image_t *src; 530 FETCH_IMG(src); 531 pipi_image_t *result; 532 result = pipi_autocontrast(src); 533 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 534 } 535 536 PHP_FUNCTION(pipi_invert) { 537 pipi_image_t *src; 538 FETCH_IMG(src); 539 pipi_image_t *result; 540 result = pipi_invert(src); 541 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 542 } 543 544 PHP_FUNCTION(pipi_threshold) { 545 } 546 547 PHP_FUNCTION(pipi_hflip) { 548 pipi_image_t *src; 549 FETCH_IMG(src); 550 pipi_image_t *result; 551 result = pipi_hflip(src); 552 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 553 } 554 555 PHP_FUNCTION(pipi_vflip) { 556 pipi_image_t *src; 557 FETCH_IMG(src); 558 pipi_image_t *result; 559 result = pipi_vflip(src); 560 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 561 } 562 563 PHP_FUNCTION(pipi_rotate90) { 564 pipi_image_t *src; 565 FETCH_IMG(src); 566 pipi_image_t *result; 567 result = pipi_rotate90(src); 568 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 569 } 570 571 PHP_FUNCTION(pipi_rotate180) { 572 pipi_image_t *src; 573 FETCH_IMG(src); 574 pipi_image_t *result; 575 result = pipi_rotate180(src); 576 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 577 } 578 579 PHP_FUNCTION(pipi_rotate270) { 580 pipi_image_t *src; 581 FETCH_IMG(src); 582 pipi_image_t *result; 583 result = pipi_rotate270(src); 584 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 585 } 586 587 PHP_FUNCTION(pipi_median) { 637 result = pipi_median(src, value); 638 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 588 639 } 589 640 590 641 PHP_FUNCTION(pipi_median_ext) { 642 zval *_zval; 643 long rx, ry = 0; 644 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &_zval, &rx, &ry) == FAILURE) { 645 RETURN_FALSE; 646 } 647 pipi_image_t *src; 648 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 649 650 pipi_image_t *result; 651 result = pipi_median_ext(src, rx, ry); 652 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 591 653 } 592 654 … … 617 679 PHP_FUNCTION(pipi_tile) { 618 680 zval *_zval; 619 long width = 0; 620 long height = 0; 681 long width, height = 0; 621 682 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &_zval, &width, &height) == FAILURE) { 622 683 RETURN_FALSE; … … 649 710 650 711 PHP_FUNCTION(pipi_dither_ordered) { 651 pipi_image_t *img1; 652 pipi_image_t *img2; 712 pipi_image_t *img1, *img2; 653 713 FETCH_IMG_IMG(img1, img2); 654 714 pipi_image_t *result; … … 658 718 659 719 PHP_FUNCTION(pipi_dither_ordered_ext) { 720 zval *_zval1; 721 zval *_zval2; 722 double precision, angle = 0; 723 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrdd", &_zval1, &_zval2, &precision, &angle) == FAILURE) { 724 RETURN_FALSE; 725 } 726 pipi_image_t *img1, *img2; 727 ZEND_FETCH_RESOURCE(img1, pipi_image_t*, &_zval1, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 728 ZEND_FETCH_RESOURCE(img2, pipi_image_t*, &_zval2, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 729 730 pipi_image_t *result; 731 result = pipi_dither_ordered_ext(img1, img2, precision, angle); 732 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 660 733 } 661 734 662 735 PHP_FUNCTION(pipi_dither_halftone) { 736 zval *_zval; 737 double r, angle = 0; 738 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rdd", &_zval, &r, &angle) == FAILURE) { 739 RETURN_FALSE; 740 } 741 pipi_image_t *src; 742 ZEND_FETCH_RESOURCE(src, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 743 744 pipi_image_t *result; 745 result = pipi_dither_halftone(src, r, angle); 746 ZEND_REGISTER_RESOURCE(return_value, result, le_pipi_image); 663 747 } 664 748
Note: See TracChangeset
for help on using the changeset viewer.