Merge pull request #1114 from cbalint13:mslic

modules/ximgproc/doc/ximgproc.bib

@@ -160,12 +160,20 @@
   keywords = {Superpixels, segmentation, clustering, k-means}
 }
 
-@InProceedings{Liu_2016_CVPR,
+@InProceedings{Liu_2017_IEEE,
   author = {Liu, Yong-Jin and Yu, Cheng-Chi and Yu, Min-Jing and He, Ying},
-  title = {Manifold SLIC: A Fast Method to Compute Content-Sensitive Superpixels},
+  title = {Intrinsic Manifold SLIC: A Simple and Efficient Method for Computing Content-Sensitive Superpixels},
-  booktitle = {The IEEE Conference on Computer Vision and Pattern Recognition (CVPR)},
+  journal = {IEEE Transactions on Pattern Analysis and Machine Intelligence},
-  month = {June},
+  issue_date = {March 2017},
-  year = {2016}
+  volume = {PP},
+  month = {mar},
+  year = {2017},
+  issue = {99},
+  url = {https://doi.org/10.1109/TPAMI.2017.2686857},
+  doi = {10.1109/TPAMI.2017.2686857},
+  publisher = {IEEE Computer Society},
+  address = {Washington, DC, USA},
+  keywords = {Superpixels, segmentation, image manifold, centroidal Voronoi tessellation, geodesic distance}
 }
 
 @InProceedings{LiCVPR2015LSC,

modules/ximgproc/include/opencv2/ximgproc/slic.hpp

@@ -72,7 +72,7 @@ extremely easy to use a lone parameter specifies the number of superpixels and t
 the algorithm makes it very practical.
 Several optimizations are available for SLIC class:
 SLICO stands for "Zero parameter SLIC" and it is an optimization of baseline SLIC descibed in @cite Achanta2012.
-MSLIC stands for "Manifold SLIC" and it is an optimization of baseline SLIC described in @cite Liu_2016_CVPR.
+MSLIC stands for "Manifold SLIC" and it is an optimization of baseline SLIC described in @cite Liu_2017_IEEE.
  */
 
 class CV_EXPORTS_W SuperpixelSLIC : public Algorithm

modules/ximgproc/src/slic.cpp

@@ -6,10 +6,10 @@
  * email : Radhakrishna [dot] Achanta [at] epfl [dot] ch
  * web : http://ivrl.epfl.ch/people/achanta
  *
- * MSLIC Copyright (c) 2016
+ * MSLIC Copyright (c) 2016, 2017
  * Yong-Jin Liu
  * email : liuyongjin [at] tsinghua [dot] edu [dot] cn
- * web : http://cg.cs.tsinghua.edu.cn/people/~Yongjin/yongjin.htm
+ * web : http://47.89.51.189/liuyj
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -49,10 +49,11 @@
  Aurelien Lucchi, Pascal Fua, and Sabine Süsstrunk, EPFL Technical
  Report no. 149300, June 2010.
 
- "Manifold SLIC: A Fast Method to Compute Content-Sensitive Superpixels"
+ "Intrinsic Manifold SLIC: A Simple and Efficient Method for Computing
+ Content-Sensitive Superpixels"
  Yong-Jin Liu, Cheng-Chi Yu, Min-Jing Yu, Ying He,
- The IEEE Conference on Computer Vision and Pattern Recognition (CVPR),
+ IEEE Transactions on Pattern Analysis and Machine Intelligence,
- 2016, pp. 651-659.
+ March 2017, Issue 99.
 
  OpenCV port by: Cristian Balint <cristian dot balint at gmail dot com>
  */