summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorcam <cameron@ideum.com>2016-10-10 19:41:23 -0600
committercam <cameron@ideum.com>2016-10-10 19:41:23 -0600
commit378cd99cd795e770b9d46ea5b8f1c1545825af54 (patch)
treec43845b292454080f9349d5fa880c27d40531574 /README.md
parent5b3a4172bfe78eb3a93e99bc63eed33894175677 (diff)
parentab3fd036f9d781c8f8238cfc3135fd2210ca0017 (diff)
Fixed conflict in README
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index 957767c..5e318f3 100644
--- a/README.md
+++ b/README.md
@@ -73,13 +73,13 @@ More than one style image can be used to blend multiple artistic styles.
### Style Interpolation
When using multiple style images, the degree to which they are blended can be controlled.
<p align="center">
+<img src="image_input/taj_mahal.jpg" height="178px">
<img src="examples/style_interpolation/taj_mahal_scream_1_starry_9.png" height="178px">
-<img src="examples/style_interpolation/taj_mahal_scream_5_starry_5.png" height="178px">
<img src="examples/style_interpolation/taj_mahal_scream_9_starry_1.png" height="178px">
-<img src="examples/style_interpolation/taj_mahal_afremov_grey_9_1.png" height="178px">
+<img src="examples/style_interpolation/taj_mahal_afremov_grey_8_2.png" height="178px">
<img src="examples/style_interpolation/taj_mahal_afremov_grey_5_5.png" height="178px">
-<img src="examples/style_interpolation/taj_mahal_afremov_grey_1_9.png" height="178px">
+<img src="examples/style_interpolation/taj_mahal_afremov_grey_2_8.png" height="178px">
</p>
### Transfer style but not color
@@ -114,14 +114,14 @@ Style can be transferred to semantic segmentations in the content image.
<img src="examples/segmentation/00110_output.png" height="192px">
<img src="examples/segmentation/00017.jpg" height="192px">
<img src="examples/segmentation/00017_mask.png" height="192px">
-<img src="examples/segmentation/00017_output.png" height="192px">
+<img src="examples/segmentation/00017_output.png" height="192px">
<img src="examples/segmentation/00768.jpg" height="192px">
<img src="examples/segmentation/00768_mask.png" height="192px">
<img src="examples/segmentation/00768_output.png" height="192px">
<img src="examples/segmentation/02630.png" height="192px">
<img src="examples/segmentation/02630_mask.png" height="192px">
-<img src="examples/segmentation/02630_output.png" height="192px">
+<img src="examples/segmentation/02630_output.png" height="192px">
</p>
Multiple styles can be transferred to the foreground and background of the content image.
@@ -353,4 +353,4 @@ If you find this code useful for your research, please cite:
journal = {GitHub repository},
howpublished = {\url{https://github.com/cysmith/neural-style-tf}},
}
-``` \ No newline at end of file
+```